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

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

arch/sparc/lib/rwsem.S

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <asm/ptrace.h>

#include <asm/psr.h>



	.section .sched.text

	.section .sched.text, "ax"

	.align	4



	.globl		___down_read

arch/sparc64/lib/GENbzero.S

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
	.align 4;		\

99:	retl;			\

	 mov	%o1, %o0;	\

	.section __ex_table;	\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.text;			\

arch/sparc64/lib/NGbzero.S

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
	.align 4;		\

99:	retl;			\

	 mov	%o1, %o0;	\

	.section __ex_table;	\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.text;			\

arch/sparc64/lib/rwsem.S

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#include <asm/rwsem-const.h>



	.section	.sched.text

	.section	.sched.text, "ax"



	.globl		__down_read

__down_read: