diff options
| -rw-r--r-- | arch/powerpc/lib/string.S | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S index 49eb1f1a2bb4..64e2e499e32a 100644 --- a/arch/powerpc/lib/string.S +++ b/arch/powerpc/lib/string.S | |||
| @@ -13,13 +13,7 @@ | |||
| 13 | #include <asm/ppc_asm.h> | 13 | #include <asm/ppc_asm.h> |
| 14 | 14 | ||
| 15 | .section __ex_table,"a" | 15 | .section __ex_table,"a" |
| 16 | #ifdef CONFIG_PPC64 | 16 | PPC_LONG_ALIGN |
| 17 | .align 3 | ||
| 18 | #define EXTBL .llong | ||
| 19 | #else | ||
| 20 | .align 2 | ||
| 21 | #define EXTBL .long | ||
| 22 | #endif | ||
| 23 | .text | 17 | .text |
| 24 | 18 | ||
| 25 | _GLOBAL(strcpy) | 19 | _GLOBAL(strcpy) |
| @@ -160,9 +154,9 @@ _GLOBAL(__clear_user) | |||
| 160 | blr | 154 | blr |
| 161 | 155 | ||
| 162 | .section __ex_table,"a" | 156 | .section __ex_table,"a" |
| 163 | EXTBL 11b,90b | 157 | PPC_LONG 11b,90b |
| 164 | EXTBL 1b,91b | 158 | PPC_LONG 1b,91b |
| 165 | EXTBL 8b,92b | 159 | PPC_LONG 8b,92b |
| 166 | .text | 160 | .text |
| 167 | 161 | ||
| 168 | _GLOBAL(__strncpy_from_user) | 162 | _GLOBAL(__strncpy_from_user) |
| @@ -183,7 +177,7 @@ _GLOBAL(__strncpy_from_user) | |||
| 183 | blr | 177 | blr |
| 184 | 178 | ||
| 185 | .section __ex_table,"a" | 179 | .section __ex_table,"a" |
| 186 | EXTBL 1b,99b | 180 | PPC_LONG 1b,99b |
| 187 | .text | 181 | .text |
| 188 | 182 | ||
| 189 | /* r3 = str, r4 = len (> 0), r5 = top (highest addr) */ | 183 | /* r3 = str, r4 = len (> 0), r5 = top (highest addr) */ |
| @@ -208,4 +202,4 @@ _GLOBAL(__strnlen_user) | |||
| 208 | blr | 202 | blr |
| 209 | 203 | ||
| 210 | .section __ex_table,"a" | 204 | .section __ex_table,"a" |
| 211 | EXTBL 1b,99b | 205 | PPC_LONG 1b,99b |