aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/futex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-05 10:02:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-05 10:02:25 -0800
commit5b10b9a787a981259cca213c8bf1c79333c3c67e (patch)
treefd6797cb174d7dc9a01bd6fd33c9033949c4887c /include/asm-sparc64/futex.h
parentc09966608da7e8cad3468e925ac9062e44fee831 (diff)
parent4d000d5b9689734006d89fe9b7597c758b74a9fb (diff)
downloadkernel_samsung_tuna-5b10b9a787a981259cca213c8bf1c79333c3c67e.zip
kernel_samsung_tuna-5b10b9a787a981259cca213c8bf1c79333c3c67e.tar.gz
kernel_samsung_tuna-5b10b9a787a981259cca213c8bf1c79333c3c67e.tar.bz2
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.
Diffstat (limited to 'include/asm-sparc64/futex.h')
-rw-r--r--include/asm-sparc64/futex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h
index 0caf601..34c4b43 100644
--- a/include/asm-sparc64/futex.h
+++ b/include/asm-sparc64/futex.h
@@ -20,7 +20,7 @@
"4: ba 3b\n" \
" mov %5, %0\n" \
" .previous\n" \
- " .section __ex_table,#alloc\n" \
+ " .section __ex_table,\"a\"\n" \
" .align 4\n" \
" .word 1b, 4b\n" \
" .word 2b, 4b\n" \