diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 21:06:56 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 21:06:56 +1100 |
| commit | 42bb1899221d362bee5480e3abc9b05243bf38fb (patch) | |
| tree | 2887b9c6e3b1a25836447a825ae466a9b69f43a5 | |
| parent | cec03afcb62fbbb0eaf943f6349ade61b89d7d40 (diff) | |
| parent | 4787083fcce866e275bedeb87cd6dfba34c84253 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix inconsistent .section usage in lib/
[SPARC/SPARC64]: Fix usage of .section .sched.text in assembler code.
| -rw-r--r-- | arch/sparc/lib/rwsem.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/GENbzero.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/NGbzero.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/rwsem.S | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/lib/rwsem.S b/arch/sparc/lib/rwsem.S index 20657744c86..f406b1f2279 100644 --- a/arch/sparc/lib/rwsem.S +++ b/arch/sparc/lib/rwsem.S @@ -7,7 +7,7 @@ #include <asm/ptrace.h> #include <asm/psr.h> - .section .sched.text + .section .sched.text, "ax" .align 4 .globl ___down_read diff --git a/arch/sparc64/lib/GENbzero.S b/arch/sparc64/lib/GENbzero.S index f9c71d64eba..6a4f956a2f7 100644 --- a/arch/sparc64/lib/GENbzero.S +++ b/arch/sparc64/lib/GENbzero.S @@ -10,7 +10,7 @@ .align 4; \ 99: retl; \ mov %o1, %o0; \ - .section __ex_table; \ + .section __ex_table,"a";\ .align 4; \ .word 98b, 99b; \ .text; \ diff --git a/arch/sparc64/lib/NGbzero.S b/arch/sparc64/lib/NGbzero.S index f10e4529ee3..814d5f7a45e 100644 --- a/arch/sparc64/lib/NGbzero.S +++ b/arch/sparc64/lib/NGbzero.S @@ -10,7 +10,7 @@ .align 4; \ 99: retl; \ mov %o1, %o0; \ - .section __ex_table; \ + .section __ex_table,"a";\ .align 4; \ .word 98b, 99b; \ .text; \ diff --git a/arch/sparc64/lib/rwsem.S b/arch/sparc64/lib/rwsem.S index 75f0e6b951d..1a4cc5654de 100644 --- a/arch/sparc64/lib/rwsem.S +++ b/arch/sparc64/lib/rwsem.S @@ -6,7 +6,7 @@ #include <asm/rwsem-const.h> - .section .sched.text + .section .sched.text, "ax" .globl __down_read __down_read: |