diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /arch/avr32/include | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'arch/avr32/include')
| -rw-r--r-- | arch/avr32/include/asm/uaccess.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/avr32/include/asm/uaccess.h b/arch/avr32/include/asm/uaccess.h index ed092395215e..245b2ee213c9 100644 --- a/arch/avr32/include/asm/uaccess.h +++ b/arch/avr32/include/asm/uaccess.h | |||
| @@ -230,10 +230,10 @@ extern int __put_user_bad(void); | |||
| 230 | asm volatile( \ | 230 | asm volatile( \ |
| 231 | "1: ld." suffix " %1, %3 \n" \ | 231 | "1: ld." suffix " %1, %3 \n" \ |
| 232 | "2: \n" \ | 232 | "2: \n" \ |
| 233 | " .section .fixup, \"ax\" \n" \ | 233 | " .subsection 1 \n" \ |
| 234 | "3: mov %0, %4 \n" \ | 234 | "3: mov %0, %4 \n" \ |
| 235 | " rjmp 2b \n" \ | 235 | " rjmp 2b \n" \ |
| 236 | " .previous \n" \ | 236 | " .subsection 0 \n" \ |
| 237 | " .section __ex_table, \"a\" \n" \ | 237 | " .section __ex_table, \"a\" \n" \ |
| 238 | " .long 1b, 3b \n" \ | 238 | " .long 1b, 3b \n" \ |
| 239 | " .previous \n" \ | 239 | " .previous \n" \ |
| @@ -295,10 +295,10 @@ extern int __put_user_bad(void); | |||
| 295 | asm volatile( \ | 295 | asm volatile( \ |
| 296 | "1: st." suffix " %1, %3 \n" \ | 296 | "1: st." suffix " %1, %3 \n" \ |
| 297 | "2: \n" \ | 297 | "2: \n" \ |
| 298 | " .section .fixup, \"ax\" \n" \ | 298 | " .subsection 1 \n" \ |
| 299 | "3: mov %0, %4 \n" \ | 299 | "3: mov %0, %4 \n" \ |
| 300 | " rjmp 2b \n" \ | 300 | " rjmp 2b \n" \ |
| 301 | " .previous \n" \ | 301 | " .subsection 0 \n" \ |
| 302 | " .section __ex_table, \"a\" \n" \ | 302 | " .section __ex_table, \"a\" \n" \ |
| 303 | " .long 1b, 3b \n" \ | 303 | " .long 1b, 3b \n" \ |
| 304 | " .previous \n" \ | 304 | " .previous \n" \ |