mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-10 07:00:48 +00:00
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.
This commit is contained in:
commit
42bb189922
@ -7,7 +7,7 @@
|
|||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
#include <asm/psr.h>
|
#include <asm/psr.h>
|
||||||
|
|
||||||
.section .sched.text
|
.section .sched.text, "ax"
|
||||||
.align 4
|
.align 4
|
||||||
|
|
||||||
.globl ___down_read
|
.globl ___down_read
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
.align 4; \
|
.align 4; \
|
||||||
99: retl; \
|
99: retl; \
|
||||||
mov %o1, %o0; \
|
mov %o1, %o0; \
|
||||||
.section __ex_table; \
|
.section __ex_table,"a";\
|
||||||
.align 4; \
|
.align 4; \
|
||||||
.word 98b, 99b; \
|
.word 98b, 99b; \
|
||||||
.text; \
|
.text; \
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
.align 4; \
|
.align 4; \
|
||||||
99: retl; \
|
99: retl; \
|
||||||
mov %o1, %o0; \
|
mov %o1, %o0; \
|
||||||
.section __ex_table; \
|
.section __ex_table,"a";\
|
||||||
.align 4; \
|
.align 4; \
|
||||||
.word 98b, 99b; \
|
.word 98b, 99b; \
|
||||||
.text; \
|
.text; \
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#include <asm/rwsem-const.h>
|
#include <asm/rwsem-const.h>
|
||||||
|
|
||||||
.section .sched.text
|
.section .sched.text, "ax"
|
||||||
|
|
||||||
.globl __down_read
|
.globl __down_read
|
||||||
__down_read:
|
__down_read:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user