diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 05:59:37 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 08:20:42 -0400 |
| commit | dbb6be6d5e974c42bbecd183effaa0df69e1dd8b (patch) | |
| tree | 5735cb47e70853d057a9881dd0ce44b83e88fa63 /arch/arm/lib/getuser.S | |
| parent | 6a867a395558a7f882d041783e4cdea6744ca2bf (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'linus' into timers/core
Reason: Further posix_cpu_timer patches depend on mainline changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/lib/getuser.S')
| -rw-r--r-- | arch/arm/lib/getuser.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index a1814d927122..b1631a7dbe75 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S | |||
| @@ -64,9 +64,9 @@ __get_user_bad: | |||
| 64 | mov pc, lr | 64 | mov pc, lr |
| 65 | ENDPROC(__get_user_bad) | 65 | ENDPROC(__get_user_bad) |
| 66 | 66 | ||
| 67 | .section __ex_table, "a" | 67 | .pushsection __ex_table, "a" |
| 68 | .long 1b, __get_user_bad | 68 | .long 1b, __get_user_bad |
| 69 | .long 2b, __get_user_bad | 69 | .long 2b, __get_user_bad |
| 70 | .long 3b, __get_user_bad | 70 | .long 3b, __get_user_bad |
| 71 | .long 4b, __get_user_bad | 71 | .long 4b, __get_user_bad |
| 72 | .previous | 72 | .popsection |