diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-03 06:27:25 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-03 06:27:25 -0500 |
| commit | c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a (patch) | |
| tree | 99b48ef0f5217fddc0aa897d9e60d95ace7da6ff /arch/m32r/lib/usercopy.c | |
| parent | 13298defe5323c7fdcac268f588d8d1090758fb8 (diff) | |
| parent | c499ec24c31edf270e777a868ffd0daddcfe7ebd (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/m32r/lib/usercopy.c')
| -rw-r--r-- | arch/m32r/lib/usercopy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c index ce16bbe26a52..2d1dd2106c4d 100644 --- a/arch/m32r/lib/usercopy.c +++ b/arch/m32r/lib/usercopy.c | |||
| @@ -64,7 +64,7 @@ do { \ | |||
| 64 | " .balign 4\n" \ | 64 | " .balign 4\n" \ |
| 65 | " .long 0b,3b\n" \ | 65 | " .long 0b,3b\n" \ |
| 66 | ".previous" \ | 66 | ".previous" \ |
| 67 | : "=r"(res), "=r"(count), "=&r" (__d0), "=&r" (__d1), \ | 67 | : "=&r"(res), "=&r"(count), "=&r" (__d0), "=&r" (__d1), \ |
| 68 | "=&r" (__d2) \ | 68 | "=&r" (__d2) \ |
| 69 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), \ | 69 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), \ |
| 70 | "4"(dst) \ | 70 | "4"(dst) \ |
| @@ -101,7 +101,7 @@ do { \ | |||
| 101 | " .balign 4\n" \ | 101 | " .balign 4\n" \ |
| 102 | " .long 0b,3b\n" \ | 102 | " .long 0b,3b\n" \ |
| 103 | ".previous" \ | 103 | ".previous" \ |
| 104 | : "=r"(res), "=r"(count), "=&r" (__d0), "=&r" (__d1), \ | 104 | : "=&r"(res), "=&r"(count), "=&r" (__d0), "=&r" (__d1), \ |
| 105 | "=&r" (__d2) \ | 105 | "=&r" (__d2) \ |
| 106 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), \ | 106 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), \ |
| 107 | "4"(dst) \ | 107 | "4"(dst) \ |