Browse Source

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 17 years ago
parent
commit
42bb189922
4 changed files with 4 additions and 4 deletions
  1. 1 1
      arch/sparc/lib/rwsem.S
  2. 1 1
      arch/sparc64/lib/GENbzero.S
  3. 1 1
      arch/sparc64/lib/NGbzero.S
  4. 1 1
      arch/sparc64/lib/rwsem.S

+ 1 - 1
arch/sparc/lib/rwsem.S

@@ -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

+ 1 - 1
arch/sparc64/lib/GENbzero.S

@@ -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;			\

+ 1 - 1
arch/sparc64/lib/NGbzero.S

@@ -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;			\

+ 1 - 1
arch/sparc64/lib/rwsem.S

@@ -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: