Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
Linus Torvalds committed Feb 1, 2008
2 parents cec03af + 4787083 commit 42bb189
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/sparc/lib/rwsem.S
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <asm/ptrace.h>
#include <asm/psr.h>

.section .sched.text
.section .sched.text, "ax"
.align 4

.globl ___down_read
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc64/lib/GENbzero.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.align 4; \
99: retl; \
mov %o1, %o0; \
.section __ex_table; \
.section __ex_table,"a";\
.align 4; \
.word 98b, 99b; \
.text; \
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc64/lib/NGbzero.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.align 4; \
99: retl; \
mov %o1, %o0; \
.section __ex_table; \
.section __ex_table,"a";\
.align 4; \
.word 98b, 99b; \
.text; \
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc64/lib/rwsem.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <asm/rwsem-const.h>

.section .sched.text
.section .sched.text, "ax"

.globl __down_read
__down_read:
Expand Down

0 comments on commit 42bb189

Please sign in to comment.