diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/arm/lib/getuser.S | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
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 |