diff options
Diffstat (limited to 'include/asm-powerpc/uaccess.h')
| -rw-r--r-- | include/asm-powerpc/uaccess.h | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/include/asm-powerpc/uaccess.h b/include/asm-powerpc/uaccess.h index 33af730f0d19..3872e924cdd6 100644 --- a/include/asm-powerpc/uaccess.h +++ b/include/asm-powerpc/uaccess.h | |||
| @@ -120,14 +120,6 @@ struct exception_table_entry { | |||
| 120 | 120 | ||
| 121 | extern long __put_user_bad(void); | 121 | extern long __put_user_bad(void); |
| 122 | 122 | ||
| 123 | #ifdef __powerpc64__ | ||
| 124 | #define __EX_TABLE_ALIGN "3" | ||
| 125 | #define __EX_TABLE_TYPE "llong" | ||
| 126 | #else | ||
| 127 | #define __EX_TABLE_ALIGN "2" | ||
| 128 | #define __EX_TABLE_TYPE "long" | ||
| 129 | #endif | ||
| 130 | |||
| 131 | /* | 123 | /* |
| 132 | * We don't tell gcc that we are accessing memory, but this is OK | 124 | * We don't tell gcc that we are accessing memory, but this is OK |
| 133 | * because we do not write to any memory gcc knows about, so there | 125 | * because we do not write to any memory gcc knows about, so there |
| @@ -142,11 +134,12 @@ extern long __put_user_bad(void); | |||
| 142 | " b 2b\n" \ | 134 | " b 2b\n" \ |
| 143 | ".previous\n" \ | 135 | ".previous\n" \ |
| 144 | ".section __ex_table,\"a\"\n" \ | 136 | ".section __ex_table,\"a\"\n" \ |
| 145 | " .align " __EX_TABLE_ALIGN "\n" \ | 137 | " .balign %5\n" \ |
| 146 | " ."__EX_TABLE_TYPE" 1b,3b\n" \ | 138 | PPC_LONG "1b,3b\n" \ |
| 147 | ".previous" \ | 139 | ".previous" \ |
| 148 | : "=r" (err) \ | 140 | : "=r" (err) \ |
| 149 | : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err)) | 141 | : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\ |
| 142 | "i"(sizeof(unsigned long))) | ||
| 150 | 143 | ||
| 151 | #ifdef __powerpc64__ | 144 | #ifdef __powerpc64__ |
| 152 | #define __put_user_asm2(x, ptr, retval) \ | 145 | #define __put_user_asm2(x, ptr, retval) \ |
| @@ -162,12 +155,13 @@ extern long __put_user_bad(void); | |||
| 162 | " b 3b\n" \ | 155 | " b 3b\n" \ |
| 163 | ".previous\n" \ | 156 | ".previous\n" \ |
| 164 | ".section __ex_table,\"a\"\n" \ | 157 | ".section __ex_table,\"a\"\n" \ |
| 165 | " .align " __EX_TABLE_ALIGN "\n" \ | 158 | " .balign %5\n" \ |
| 166 | " ." __EX_TABLE_TYPE " 1b,4b\n" \ | 159 | PPC_LONG "1b,4b\n" \ |
| 167 | " ." __EX_TABLE_TYPE " 2b,4b\n" \ | 160 | PPC_LONG "2b,4b\n" \ |
| 168 | ".previous" \ | 161 | ".previous" \ |
| 169 | : "=r" (err) \ | 162 | : "=r" (err) \ |
| 170 | : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err)) | 163 | : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\ |
| 164 | "i"(sizeof(unsigned long))) | ||
| 171 | #endif /* __powerpc64__ */ | 165 | #endif /* __powerpc64__ */ |
| 172 | 166 | ||
| 173 | #define __put_user_size(x, ptr, size, retval) \ | 167 | #define __put_user_size(x, ptr, size, retval) \ |
| @@ -213,11 +207,12 @@ extern long __get_user_bad(void); | |||
| 213 | " b 2b\n" \ | 207 | " b 2b\n" \ |
| 214 | ".previous\n" \ | 208 | ".previous\n" \ |
| 215 | ".section __ex_table,\"a\"\n" \ | 209 | ".section __ex_table,\"a\"\n" \ |
| 216 | " .align "__EX_TABLE_ALIGN "\n" \ | 210 | " .balign %5\n" \ |
| 217 | " ." __EX_TABLE_TYPE " 1b,3b\n" \ | 211 | PPC_LONG "1b,3b\n" \ |
| 218 | ".previous" \ | 212 | ".previous" \ |
| 219 | : "=r" (err), "=r" (x) \ | 213 | : "=r" (err), "=r" (x) \ |
| 220 | : "b" (addr), "i" (-EFAULT), "0" (err)) | 214 | : "b" (addr), "i" (-EFAULT), "0" (err), \ |
| 215 | "i"(sizeof(unsigned long))) | ||
| 221 | 216 | ||
| 222 | #ifdef __powerpc64__ | 217 | #ifdef __powerpc64__ |
| 223 | #define __get_user_asm2(x, addr, err) \ | 218 | #define __get_user_asm2(x, addr, err) \ |
| @@ -235,12 +230,13 @@ extern long __get_user_bad(void); | |||
| 235 | " b 3b\n" \ | 230 | " b 3b\n" \ |
| 236 | ".previous\n" \ | 231 | ".previous\n" \ |
| 237 | ".section __ex_table,\"a\"\n" \ | 232 | ".section __ex_table,\"a\"\n" \ |
| 238 | " .align " __EX_TABLE_ALIGN "\n" \ | 233 | " .balign %5\n" \ |
| 239 | " ." __EX_TABLE_TYPE " 1b,4b\n" \ | 234 | PPC_LONG "1b,4b\n" \ |
| 240 | " ." __EX_TABLE_TYPE " 2b,4b\n" \ | 235 | PPC_LONG "2b,4b\n" \ |
| 241 | ".previous" \ | 236 | ".previous" \ |
| 242 | : "=r" (err), "=&r" (x) \ | 237 | : "=r" (err), "=&r" (x) \ |
| 243 | : "b" (addr), "i" (-EFAULT), "0" (err)) | 238 | : "b" (addr), "i" (-EFAULT), "0" (err), \ |
| 239 | "i"(sizeof(unsigned long))) | ||
| 244 | #endif /* __powerpc64__ */ | 240 | #endif /* __powerpc64__ */ |
| 245 | 241 | ||
| 246 | #define __get_user_size(x, ptr, size, retval) \ | 242 | #define __get_user_size(x, ptr, size, retval) \ |