diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-02-12 16:05:33 -0500 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-02-12 16:05:33 -0500 |
commit | b747664516aaced3395f8969f291703fd5d879d7 (patch) | |
tree | 9db10859238ee11a67ca86d0abd6bc47888a3e72 /arch/sparc/lib/bzero.S | |
parent | 8e08f6eb34af13b78d379a025e4c9f8612b47b95 (diff) | |
parent | 071a0bc2ceace31266836801510879407a3701fa (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc/lib/bzero.S')
-rw-r--r-- | arch/sparc/lib/bzero.S | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sparc/lib/bzero.S b/arch/sparc/lib/bzero.S index c7bbae8c590f..b6557297440f 100644 --- a/arch/sparc/lib/bzero.S +++ b/arch/sparc/lib/bzero.S | |||
@@ -88,13 +88,9 @@ __bzero_done: | |||
88 | 88 | ||
89 | #define EX_ST(x,y) \ | 89 | #define EX_ST(x,y) \ |
90 | 98: x,y; \ | 90 | 98: x,y; \ |
91 | .section .fixup; \ | ||
92 | .align 4; \ | ||
93 | 99: retl; \ | ||
94 | mov %o1, %o0; \ | ||
95 | .section __ex_table,"a";\ | 91 | .section __ex_table,"a";\ |
96 | .align 4; \ | 92 | .align 4; \ |
97 | .word 98b, 99b; \ | 93 | .word 98b, __retl_o1; \ |
98 | .text; \ | 94 | .text; \ |
99 | .align 4; | 95 | .align 4; |
100 | 96 | ||