Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b10b9a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Mark __ex_table section correctly.
parents c0996660 4d000d5b

arch/sparc64/kernel/sys32.S

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ do_sys_recvmsg: /* compat_sys_recvmsg(int, struct compat_msghdr *, unsigned int) 
	nop

	nop



	.section	__ex_table

	.section	__ex_table,"a"

	.align		4

	.word		1b, __retl_efault, 2b, __retl_efault

	.word		3b, __retl_efault, 4b, __retl_efault

arch/sparc64/kernel/una_asm.S

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ __do_int_store: 
	 mov	0, %o0

	.size	__do_int_store, .-__do_int_store



	.section	__ex_table

	.section	__ex_table,"a"

	.word		4b, __retl_efault

	.word		5b, __retl_efault

	.word		6b, __retl_efault
@@ -129,7 +129,7 @@ do_int_load: 
	 mov	0, %o0

	.size	__do_int_load, .-__do_int_load



	.section	__ex_table

	.section	__ex_table,"a"

	.word		4b, __retl_efault

	.word		5b, __retl_efault

	.word		6b, __retl_efault

arch/sparc64/lib/U1copy_from_user.S

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

99:	retl;			\

	 mov	1, %o0;		\

	.section __ex_table;	\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.text;			\

arch/sparc64/lib/U1copy_to_user.S

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

99:	retl;			\

	 mov	1, %o0;		\

	.section __ex_table;	\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.text;			\

arch/sparc64/lib/U3copy_from_user.S

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

99:	retl;			\

	 mov	1, %o0;		\

	.section __ex_table;	\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.text;			\