Commit 40bdac7d authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Kill .fixup section bloat. 



This is an implementation of a suggestion made by Chris Torek:
--------------------
Something else I noticed in passing: the EX and EX_LD/EX_ST macros
scattered throughout the various .S files make a fair bit of .fixup
code, all of which does the same thing.  At the cost of one symbol
in copy_in_user.S, you could just have one common two-instruction
retl-and-mov-1 fixup that they all share.
--------------------

The following is with a defconfig build:

   text	   data	    bss	    dec	    hex	filename
3972767	 344024	 584449	4901240	 4ac978	vmlinux.orig
39688877	 344024	 584449	4897360	 4aba50	vmlinux

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c2f61d4

arch/sparc/kernel/head_64.S

+28 −3
Original line number Diff line number Diff line
@@ -891,10 +891,35 @@ prom_tba: .xword 0 
tlb_type:	.word	0	/* Must NOT end up in BSS */

	.section	".fixup",#alloc,#execinstr



	.globl	__ret_efault, __retl_efault

__ret_efault:

	.globl	__ret_efault, __retl_efault, __ret_one, __retl_one

ENTRY(__ret_efault)

	ret

	 restore %g0, -EFAULT, %o0

__retl_efault:

ENDPROC(__ret_efault)



ENTRY(__retl_efault)

	retl

	 mov	-EFAULT, %o0

ENDPROC(__retl_efault)



ENTRY(__retl_one)

	retl

	 mov	1, %o0

ENDPROC(__retl_one)



ENTRY(__ret_one_asi)

	wr	%g0, ASI_AIUS, %asi

	ret

	 restore %g0, 1, %o0

ENDPROC(__ret_one_asi)



ENTRY(__retl_one_asi)

	wr	%g0, ASI_AIUS, %asi

	retl

	 mov	1, %o0

ENDPROC(__retl_one_asi)



ENTRY(__retl_o1)

	retl

	 mov	%o1, %o0

ENDPROC(__retl_o1)

arch/sparc/lib/GENbzero.S

+1 −5
Original line number Diff line number Diff line
@@ -6,13 +6,9 @@ 


#define EX_ST(x,y)		\

98:	x,y;			\

	.section .fixup;	\

	.align 4;		\

99:	retl;			\

	 mov	%o1, %o0;	\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.word 98b, __retl_o1;	\

	.text;			\

	.align 4;

arch/sparc/lib/GENcopy_from_user.S

+1 −5
Original line number Diff line number Diff line
@@ -5,13 +5,9 @@ 


#define EX_LD(x)		\

98:	x;			\

	.section .fixup;	\

	.align 4;		\

99:	retl;			\

	 mov	1, %o0;		\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.word 98b, __retl_one;	\

	.text;			\

	.align 4;

arch/sparc/lib/GENcopy_to_user.S

+1 −5
Original line number Diff line number Diff line
@@ -5,13 +5,9 @@ 


#define EX_ST(x)		\

98:	x;			\

	.section .fixup;	\

	.align 4;		\

99:	retl;			\

	 mov	1, %o0;		\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.word 98b, __retl_one;	\

	.text;			\

	.align 4;

arch/sparc/lib/NG2copy_from_user.S

+1 −6
Original line number Diff line number Diff line
@@ -5,14 +5,9 @@ 


#define EX_LD(x)		\

98:	x;			\

	.section .fixup;	\

	.align 4;		\

99:	wr	%g0, ASI_AIUS, %asi;\

	retl;			\

	 mov	1, %o0;		\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, 99b;		\

	.word 98b, __retl_one_asi;\

	.text;			\

	.align 4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE