Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
6c0741fb
Commit
6c0741fb
authored
Sep 18, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
628f87f3
118ec0b3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+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
No files found.
arch/arm/kernel/semaphore.c
View file @
6c0741fb
...
...
@@ -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
* value in some cases..
*/
asm
(
" .section .sched.text,
\"
ax
\"
\n
\
asm
(
" .section .sched.text,
\"
ax
\"
,%progbits
\n
\
.align 5
\n
\
.globl __down_failed
\n
\
__down_failed:
\n
\
...
...
arch/arm/mach-ixp4xx/ixdp425-setup.c
View file @
6c0741fb
...
...
@@ -123,6 +123,7 @@ static void __init ixdp425_init(void)
platform_add_devices
(
ixdp425_devices
,
ARRAY_SIZE
(
ixdp425_devices
));
}
#ifdef CONFIG_ARCH_IXDP465
MACHINE_START
(
IXDP425
,
"Intel IXDP425 Development Platform"
)
/* Maintainer: MontaVista Software, Inc. */
.
phys_ram
=
PHYS_OFFSET
,
...
...
@@ -134,7 +135,9 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
.
boot_params
=
0x0100
,
.
init_machine
=
ixdp425_init
,
MACHINE_END
#endif
#ifdef CONFIG_MACH_IXDP465
MACHINE_START
(
IXDP465
,
"Intel IXDP465 Development Platform"
)
/* Maintainer: MontaVista Software, Inc. */
.
phys_ram
=
PHYS_OFFSET
,
...
...
@@ -146,7 +149,9 @@ MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
.
boot_params
=
0x0100
,
.
init_machine
=
ixdp425_init
,
MACHINE_END
#endif
#ifdef CONFIG_ARCH_PRPMC1100
MACHINE_START
(
IXCDP1100
,
"Intel IXCDP1100 Development Platform"
)
/* Maintainer: MontaVista Software, Inc. */
.
phys_ram
=
PHYS_OFFSET
,
...
...
@@ -158,6 +163,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
.
boot_params
=
0x0100
,
.
init_machine
=
ixdp425_init
,
MACHINE_END
#endif
/*
* Avila is functionally equivalent to IXDP425 except that it adds
...
...
arch/arm/mach-sa1100/generic.h
View file @
6c0741fb
...
...
@@ -39,3 +39,6 @@ extern void sa11x0_set_ssp_data(struct sa11x0_ssp_plat_ops *ops);
struct
irda_platform_data
;
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
View file @
6c0741fb
...
...
@@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
int
cmp
=
(
encoded_op
>>
24
)
&
15
;
int
oparg
=
(
encoded_op
<<
8
)
>>
20
;
int
cmparg
=
(
encoded_op
<<
20
)
>>
20
;
int
oldval
=
0
,
ret
,
tem
;
int
oldval
=
0
,
ret
;
if
(
encoded_op
&
(
FUTEX_OP_OPARG_SHIFT
<<
28
))
oparg
=
1
<<
oparg
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment