diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /arch/arm/lib/getuser.S | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
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 |