Commit 42bb1899 authored by Linus Torvalds's avatar Linus Torvalds

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.
parents cec03afc 4787083f
......@@ -7,7 +7,7 @@
#include <asm/ptrace.h>
#include <asm/psr.h>
.section .sched.text
.section .sched.text, "ax"
.align 4
.globl ___down_read
......
......@@ -10,7 +10,7 @@
.align 4; \
99: retl; \
mov %o1, %o0; \
.section __ex_table; \
.section __ex_table,"a";\
.align 4; \
.word 98b, 99b; \
.text; \
......
......@@ -10,7 +10,7 @@
.align 4; \
99: retl; \
mov %o1, %o0; \
.section __ex_table; \
.section __ex_table,"a";\
.align 4; \
.word 98b, 99b; \
.text; \
......
......@@ -6,7 +6,7 @@
#include <asm/rwsem-const.h>
.section .sched.text
.section .sched.text, "ax"
.globl __down_read
__down_read:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment