Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
6c0741fb
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6c0741fb
编写于
9月 18, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/home/rmk/linux-2.6-arm
上级
628f87f3
118ec0b3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
2 deletion
+11
-2
arch/arm/kernel/semaphore.c
arch/arm/kernel/semaphore.c
+1
-1
arch/arm/mach-ixp4xx/ixdp425-setup.c
arch/arm/mach-ixp4xx/ixdp425-setup.c
+6
-0
arch/arm/mach-sa1100/generic.h
arch/arm/mach-sa1100/generic.h
+3
-0
include/asm-arm/futex.h
include/asm-arm/futex.h
+1
-1
未找到文件。
arch/arm/kernel/semaphore.c
浏览文件 @
6c0741fb
...
@@ -178,7 +178,7 @@ int __down_trylock(struct semaphore * sem)
...
@@ -178,7 +178,7 @@ int __down_trylock(struct semaphore * sem)
* registers (r0 to r3 and lr), but not ip, as we use it as a return
* registers (r0 to r3 and lr), but not ip, as we use it as a return
* value in some cases..
* value in some cases..
*/
*/
asm
(
" .section .sched.text,
\"
ax
\"
\n
\
asm
(
" .section .sched.text,
\"
ax
\"
,%progbits
\n
\
.align 5
\n
\
.align 5
\n
\
.globl __down_failed
\n
\
.globl __down_failed
\n
\
__down_failed:
\n
\
__down_failed:
\n
\
...
...
arch/arm/mach-ixp4xx/ixdp425-setup.c
浏览文件 @
6c0741fb
...
@@ -123,6 +123,7 @@ static void __init ixdp425_init(void)
...
@@ -123,6 +123,7 @@ static void __init ixdp425_init(void)
platform_add_devices
(
ixdp425_devices
,
ARRAY_SIZE
(
ixdp425_devices
));
platform_add_devices
(
ixdp425_devices
,
ARRAY_SIZE
(
ixdp425_devices
));
}
}
#ifdef CONFIG_ARCH_IXDP465
MACHINE_START
(
IXDP425
,
"Intel IXDP425 Development Platform"
)
MACHINE_START
(
IXDP425
,
"Intel IXDP425 Development Platform"
)
/* Maintainer: MontaVista Software, Inc. */
/* Maintainer: MontaVista Software, Inc. */
.
phys_ram
=
PHYS_OFFSET
,
.
phys_ram
=
PHYS_OFFSET
,
...
@@ -134,7 +135,9 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
...
@@ -134,7 +135,9 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
.
boot_params
=
0x0100
,
.
boot_params
=
0x0100
,
.
init_machine
=
ixdp425_init
,
.
init_machine
=
ixdp425_init
,
MACHINE_END
MACHINE_END
#endif
#ifdef CONFIG_MACH_IXDP465
MACHINE_START
(
IXDP465
,
"Intel IXDP465 Development Platform"
)
MACHINE_START
(
IXDP465
,
"Intel IXDP465 Development Platform"
)
/* Maintainer: MontaVista Software, Inc. */
/* Maintainer: MontaVista Software, Inc. */
.
phys_ram
=
PHYS_OFFSET
,
.
phys_ram
=
PHYS_OFFSET
,
...
@@ -146,7 +149,9 @@ MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
...
@@ -146,7 +149,9 @@ MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
.
boot_params
=
0x0100
,
.
boot_params
=
0x0100
,
.
init_machine
=
ixdp425_init
,
.
init_machine
=
ixdp425_init
,
MACHINE_END
MACHINE_END
#endif
#ifdef CONFIG_ARCH_PRPMC1100
MACHINE_START
(
IXCDP1100
,
"Intel IXCDP1100 Development Platform"
)
MACHINE_START
(
IXCDP1100
,
"Intel IXCDP1100 Development Platform"
)
/* Maintainer: MontaVista Software, Inc. */
/* Maintainer: MontaVista Software, Inc. */
.
phys_ram
=
PHYS_OFFSET
,
.
phys_ram
=
PHYS_OFFSET
,
...
@@ -158,6 +163,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
...
@@ -158,6 +163,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
.
boot_params
=
0x0100
,
.
boot_params
=
0x0100
,
.
init_machine
=
ixdp425_init
,
.
init_machine
=
ixdp425_init
,
MACHINE_END
MACHINE_END
#endif
/*
/*
* Avila is functionally equivalent to IXDP425 except that it adds
* Avila is functionally equivalent to IXDP425 except that it adds
...
...
arch/arm/mach-sa1100/generic.h
浏览文件 @
6c0741fb
...
@@ -39,3 +39,6 @@ extern void sa11x0_set_ssp_data(struct sa11x0_ssp_plat_ops *ops);
...
@@ -39,3 +39,6 @@ extern void sa11x0_set_ssp_data(struct sa11x0_ssp_plat_ops *ops);
struct
irda_platform_data
;
struct
irda_platform_data
;
void
sa11x0_set_irda_data
(
struct
irda_platform_data
*
irda
);
void
sa11x0_set_irda_data
(
struct
irda_platform_data
*
irda
);
struct
mcp_plat_data
;
void
sa11x0_set_mcp_data
(
struct
mcp_plat_data
*
data
);
include/asm-arm/futex.h
浏览文件 @
6c0741fb
...
@@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
...
@@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
int
cmp
=
(
encoded_op
>>
24
)
&
15
;
int
cmp
=
(
encoded_op
>>
24
)
&
15
;
int
oparg
=
(
encoded_op
<<
8
)
>>
20
;
int
oparg
=
(
encoded_op
<<
8
)
>>
20
;
int
cmparg
=
(
encoded_op
<<
20
)
>>
20
;
int
cmparg
=
(
encoded_op
<<
20
)
>>
20
;
int
oldval
=
0
,
ret
,
tem
;
int
oldval
=
0
,
ret
;
if
(
encoded_op
&
(
FUTEX_OP_OPARG_SHIFT
<<
28
))
if
(
encoded_op
&
(
FUTEX_OP_OPARG_SHIFT
<<
28
))
oparg
=
1
<<
oparg
;
oparg
=
1
<<
oparg
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录