diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-14 09:29:52 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 09:29:52 -0400 |
| commit | 23e117fa44429cc054cb27d5621d64e4ced91e52 (patch) | |
| tree | a4b9d0902b9c6f009b2c297515221c1b9bed3af8 /arch/arm/lib/putuser.S | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | a93d2f1744206827ccf416e2cdc5018aa503314e (diff) | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4
Diffstat (limited to 'arch/arm/lib/putuser.S')
| -rw-r--r-- | arch/arm/lib/putuser.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S index 02fedbf07c0d..5a01a23c6c06 100644 --- a/arch/arm/lib/putuser.S +++ b/arch/arm/lib/putuser.S | |||
| @@ -81,11 +81,11 @@ __put_user_bad: | |||
| 81 | mov pc, lr | 81 | mov pc, lr |
| 82 | ENDPROC(__put_user_bad) | 82 | ENDPROC(__put_user_bad) |
| 83 | 83 | ||
| 84 | .section __ex_table, "a" | 84 | .pushsection __ex_table, "a" |
| 85 | .long 1b, __put_user_bad | 85 | .long 1b, __put_user_bad |
| 86 | .long 2b, __put_user_bad | 86 | .long 2b, __put_user_bad |
| 87 | .long 3b, __put_user_bad | 87 | .long 3b, __put_user_bad |
| 88 | .long 4b, __put_user_bad | 88 | .long 4b, __put_user_bad |
| 89 | .long 5b, __put_user_bad | 89 | .long 5b, __put_user_bad |
| 90 | .long 6b, __put_user_bad | 90 | .long 6b, __put_user_bad |
| 91 | .previous | 91 | .popsection |