tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Linus Torvalds 42bb1899 cec03afc

+4 -4
unified split
+1 -1
arch/sparc/lib/rwsem.S
··· 7 #include <asm/ptrace.h> 8 #include <asm/psr.h> 9 10 - .section .sched.text 11 .align 4 12 13 .globl ___down_read
··· 7 #include <asm/ptrace.h> 8 #include <asm/psr.h> 9 10 + .section .sched.text, "ax" 11 .align 4 12 13 .globl ___down_read
+1 -1
arch/sparc64/lib/GENbzero.S
··· 10 .align 4; \ 11 99: retl; \ 12 mov %o1, %o0; \ 13 - .section __ex_table; \ 14 .align 4; \ 15 .word 98b, 99b; \ 16 .text; \
··· 10 .align 4; \ 11 99: retl; \ 12 mov %o1, %o0; \ 13 + .section __ex_table,"a";\ 14 .align 4; \ 15 .word 98b, 99b; \ 16 .text; \
+1 -1
arch/sparc64/lib/NGbzero.S
··· 10 .align 4; \ 11 99: retl; \ 12 mov %o1, %o0; \ 13 - .section __ex_table; \ 14 .align 4; \ 15 .word 98b, 99b; \ 16 .text; \
··· 10 .align 4; \ 11 99: retl; \ 12 mov %o1, %o0; \ 13 + .section __ex_table,"a";\ 14 .align 4; \ 15 .word 98b, 99b; \ 16 .text; \
+1 -1
arch/sparc64/lib/rwsem.S
··· 6 7 #include <asm/rwsem-const.h> 8 9 - .section .sched.text 10 11 .globl __down_read 12 __down_read:
··· 6 7 #include <asm/rwsem-const.h> 8 9 + .section .sched.text, "ax" 10 11 .globl __down_read 12 __down_read: