Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mellanox
Bluefield Linux
提交
d033d934
B
Bluefield Linux
项目概览
mellanox
/
Bluefield Linux
12 个月 前同步成功
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
B
Bluefield Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d033d934
编写于
3月 06, 2006
作者:
J
Jeff Garzik
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master'
上级
a7a80d5a
501f74f2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
22 addition
and
17 deletion
+22
-17
arch/powerpc/kernel/head_64.S
arch/powerpc/kernel/head_64.S
+3
-0
drivers/char/hw_random.c
drivers/char/hw_random.c
+2
-0
drivers/mmc/au1xmmc.c
drivers/mmc/au1xmmc.c
+12
-12
fs/reiserfs/namei.c
fs/reiserfs/namei.c
+4
-4
include/linux/reiserfs_fs.h
include/linux/reiserfs_fs.h
+1
-1
未找到文件。
arch/powerpc/kernel/head_64.S
浏览文件 @
d033d934
...
...
@@ -1537,6 +1537,9 @@ _STATIC(__boot_from_prom)
mr
r28
,
r6
mr
r27
,
r7
/
*
Align
the
stack
to
16
-
byte
boundary
for
broken
yaboot
*/
rldicr
r1
,
r1
,
0
,
59
/
*
Make
sure
we
are
running
in
64
bits
mode
*/
bl
.
enable_64b_mode
...
...
drivers/char/hw_random.c
浏览文件 @
d033d934
...
...
@@ -131,7 +131,9 @@ enum {
rng_hw_none
,
rng_hw_intel
,
rng_hw_amd
,
#ifdef __i386__
rng_hw_via
,
#endif
rng_hw_geode
,
};
...
...
drivers/mmc/au1xmmc.c
浏览文件 @
d033d934
...
...
@@ -37,7 +37,7 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/
platform_
device.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
...
...
@@ -194,7 +194,7 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
u32
mmccmd
=
(
cmd
->
opcode
<<
SD_CMD_CI_SHIFT
);
switch
(
mmc_r
sp_type
(
cmd
->
flags
))
{
switch
(
mmc_r
esp_type
(
cmd
))
{
case
MMC_RSP_R1
:
mmccmd
|=
SD_CMD_RT_1
;
break
;
...
...
@@ -740,7 +740,6 @@ static void au1xmmc_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
static
void
au1xmmc_dma_callback
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
struct
au1xmmc_host
*
host
=
(
struct
au1xmmc_host
*
)
dev_id
;
u32
status
;
/* Avoid spurious interrupts */
...
...
@@ -887,7 +886,7 @@ struct mmc_host_ops au1xmmc_ops = {
.
set_ios
=
au1xmmc_set_ios
,
};
static
int
au1xmmc_probe
(
struct
device
*
dev
)
static
int
__devinit
au1xmmc_probe
(
struct
platform_device
*
p
dev
)
{
int
i
,
ret
=
0
;
...
...
@@ -904,7 +903,7 @@ static int au1xmmc_probe(struct device *dev)
disable_irq
(
AU1100_SD_IRQ
);
for
(
i
=
0
;
i
<
AU1XMMC_CONTROLLER_COUNT
;
i
++
)
{
struct
mmc_host
*
mmc
=
mmc_alloc_host
(
sizeof
(
struct
au1xmmc_host
),
dev
);
struct
mmc_host
*
mmc
=
mmc_alloc_host
(
sizeof
(
struct
au1xmmc_host
),
&
pdev
->
dev
);
struct
au1xmmc_host
*
host
=
0
;
if
(
!
mmc
)
{
...
...
@@ -967,7 +966,7 @@ static int au1xmmc_probe(struct device *dev)
return
0
;
}
static
int
au1xmmc_remove
(
struct
device
*
dev
)
static
int
__devexit
au1xmmc_remove
(
struct
platform_device
*
p
dev
)
{
int
i
;
...
...
@@ -997,23 +996,24 @@ static int au1xmmc_remove(struct device *dev)
return
0
;
}
static
struct
device_driver
au1xmmc_driver
=
{
.
name
=
DRIVER_NAME
,
.
bus
=
&
platform_bus_type
,
static
struct
platform_driver
au1xmmc_driver
=
{
.
probe
=
au1xmmc_probe
,
.
remove
=
au1xmmc_remove
,
.
suspend
=
NULL
,
.
resume
=
NULL
.
resume
=
NULL
,
.
driver
=
{
.
name
=
DRIVER_NAME
,
},
};
static
int
__init
au1xmmc_init
(
void
)
{
return
driver_register
(
&
au1xmmc_driver
);
return
platform_
driver_register
(
&
au1xmmc_driver
);
}
static
void
__exit
au1xmmc_exit
(
void
)
{
driver_unregister
(
&
au1xmmc_driver
);
platform_
driver_unregister
(
&
au1xmmc_driver
);
}
module_init
(
au1xmmc_init
);
...
...
fs/reiserfs/namei.c
浏览文件 @
d033d934
...
...
@@ -247,7 +247,7 @@ static int linear_search_in_dir_item(struct cpu_key *key,
/* mark, that this generation number is used */
if
(
de
->
de_gen_number_bit_string
)
set_bit
(
GET_GENERATION_NUMBER
(
deh_offset
(
deh
)),
(
unsigned
long
*
)
de
->
de_gen_number_bit_string
);
de
->
de_gen_number_bit_string
);
// calculate pointer to name and namelen
de
->
de_entry_num
=
i
;
...
...
@@ -431,7 +431,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
struct
reiserfs_de_head
*
deh
;
INITIALIZE_PATH
(
path
);
struct
reiserfs_dir_entry
de
;
int
bit_string
[
MAX_GENERATION_NUMBER
/
(
sizeof
(
int
)
*
8
)
+
1
]
;
DECLARE_BITMAP
(
bit_string
,
MAX_GENERATION_NUMBER
+
1
)
;
int
gen_number
;
char
small_buf
[
32
+
DEH_SIZE
];
/* 48 bytes now and we avoid kmalloc
if we create file with short name */
...
...
@@ -486,7 +486,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
/* find the proper place for the new entry */
memset
(
bit_string
,
0
,
sizeof
(
bit_string
));
de
.
de_gen_number_bit_string
=
(
char
*
)
bit_string
;
de
.
de_gen_number_bit_string
=
bit_string
;
retval
=
reiserfs_find_entry
(
dir
,
name
,
namelen
,
&
path
,
&
de
);
if
(
retval
!=
NAME_NOT_FOUND
)
{
if
(
buffer
!=
small_buf
)
...
...
@@ -508,7 +508,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
}
gen_number
=
find_first_zero_bit
(
(
unsigned
long
*
)
bit_string
,
find_first_zero_bit
(
bit_string
,
MAX_GENERATION_NUMBER
+
1
);
if
(
gen_number
>
MAX_GENERATION_NUMBER
)
{
/* there is no free generation number */
...
...
include/linux/reiserfs_fs.h
浏览文件 @
d033d934
...
...
@@ -1052,7 +1052,7 @@ struct reiserfs_dir_entry {
int
de_entrylen
;
int
de_namelen
;
char
*
de_name
;
char
*
de_gen_number_bit_string
;
unsigned
long
*
de_gen_number_bit_string
;
__u32
de_dir_id
;
__u32
de_objectid
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录