Update of /cvsroot/linux-vax/kernel-2.4/arch/arm/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/arm/kernel
Modified Files:
entry-common.S semaphore.c
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)
Index: entry-common.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/arm/kernel/entry-common.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- entry-common.S 10 Apr 2002 13:51:21 -0000 1.2
+++ entry-common.S 10 Jun 2003 01:45:49 -0000 1.3
@@ -22,12 +22,10 @@
* Our do_softirq out of line code. See include/asm-arm/softirq.h for
* the calling assembly.
*/
- .section ".text.lock","ax"
ENTRY(__do_softirq)
stmfd sp!, {r0 - r3, ip, lr}
bl do_softirq
ldmfd sp!, {r0 - r3, ip, pc}
- .previous
.align 5
/*
Index: semaphore.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/arm/kernel/semaphore.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- semaphore.c 10 Apr 2002 13:51:21 -0000 1.2
+++ semaphore.c 10 Jun 2003 01:45:49 -0000 1.3
@@ -177,8 +177,7 @@
* value in some cases..
*/
#ifdef CONFIG_CPU_26
-asm(" .section .text.lock, \"ax\"
- .align 5
+asm(" .align 5
.globl __down_failed
__down_failed:
stmfd sp!, {r0 - r3, lr}
@@ -212,13 +211,11 @@
bl __up
ldmfd sp!, {r0 - r3, pc}^
- .previous
");
#else
/* 32 bit version */
-asm(" .section .text.lock, \"ax\"
- .align 5
+asm(" .align 5
.globl __down_failed
__down_failed:
stmfd sp!, {r0 - r3, lr}
@@ -252,7 +249,6 @@
bl __up
ldmfd sp!, {r0 - r3, pc}
- .previous
");
#endif
|
