summaryrefslogtreecommitdiff
path: root/arch/sparc/lib/csum_copy_from_user.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-01 08:02:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-01 08:02:31 -0700
commit65039a31f4e44630f96f1b602c43cc8ad180d4fe (patch)
tree33d671501970281f3587d97e7aba31c8f2e21cd6 /arch/sparc/lib/csum_copy_from_user.S
parent6e429101849416551150dad451f7e8625317ae09 (diff)
parent6373fffc5d555caf3acf7c5796cec9820aaf7479 (diff)
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 section attribute warnings. sparc64: Fix SET_PERSONALITY to not clip bits outside of PER_MASK.
Diffstat (limited to 'arch/sparc/lib/csum_copy_from_user.S')
-rw-r--r--arch/sparc/lib/csum_copy_from_user.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/lib/csum_copy_from_user.S b/arch/sparc/lib/csum_copy_from_user.S
index a22eddbe5dba..e0304e6a2242 100644
--- a/arch/sparc/lib/csum_copy_from_user.S
+++ b/arch/sparc/lib/csum_copy_from_user.S
@@ -5,7 +5,7 @@
#define EX_LD(x) \
98: x; \
- .section .fixup; \
+ .section .fixup, "ax"; \
.align 4; \
99: retl; \
mov -1, %o0; \