diff options
| -rw-r--r-- | arch/x86/lib/mmx_32.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c index 28084d2e8dd4..cc9b4a4450f3 100644 --- a/arch/x86/lib/mmx_32.c +++ b/arch/x86/lib/mmx_32.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <linux/hardirq.h> | 4 | #include <linux/hardirq.h> |
| 5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 6 | 6 | ||
| 7 | #include <asm/asm.h> | ||
| 7 | #include <asm/i387.h> | 8 | #include <asm/i387.h> |
| 8 | 9 | ||
| 9 | 10 | ||
| @@ -50,10 +51,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len) | |||
| 50 | "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ | 51 | "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ |
| 51 | " jmp 2b\n" | 52 | " jmp 2b\n" |
| 52 | ".previous\n" | 53 | ".previous\n" |
| 53 | ".section __ex_table,\"a\"\n" | 54 | _ASM_EXTABLE(1b,3b) |
| 54 | " .align 4\n" | ||
| 55 | " .long 1b, 3b\n" | ||
| 56 | ".previous" | ||
| 57 | : : "r" (from) ); | 55 | : : "r" (from) ); |
| 58 | 56 | ||
| 59 | 57 | ||
| @@ -81,10 +79,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len) | |||
| 81 | "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ | 79 | "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ |
| 82 | " jmp 2b\n" | 80 | " jmp 2b\n" |
| 83 | ".previous\n" | 81 | ".previous\n" |
| 84 | ".section __ex_table,\"a\"\n" | 82 | _ASM_EXTABLE(1b,3b) |
| 85 | " .align 4\n" | ||
| 86 | " .long 1b, 3b\n" | ||
| 87 | ".previous" | ||
| 88 | : : "r" (from), "r" (to) : "memory"); | 83 | : : "r" (from), "r" (to) : "memory"); |
| 89 | from+=64; | 84 | from+=64; |
| 90 | to+=64; | 85 | to+=64; |
| @@ -181,10 +176,7 @@ static void fast_copy_page(void *to, void *from) | |||
| 181 | "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ | 176 | "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ |
| 182 | " jmp 2b\n" | 177 | " jmp 2b\n" |
| 183 | ".previous\n" | 178 | ".previous\n" |
| 184 | ".section __ex_table,\"a\"\n" | 179 | _ASM_EXTABLE(1b,3b) |
| 185 | " .align 4\n" | ||
| 186 | " .long 1b, 3b\n" | ||
| 187 | ".previous" | ||
| 188 | : : "r" (from) ); | 180 | : : "r" (from) ); |
| 189 | 181 | ||
| 190 | for(i=0; i<(4096-320)/64; i++) | 182 | for(i=0; i<(4096-320)/64; i++) |
| @@ -211,10 +203,7 @@ static void fast_copy_page(void *to, void *from) | |||
| 211 | "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ | 203 | "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ |
| 212 | " jmp 2b\n" | 204 | " jmp 2b\n" |
| 213 | ".previous\n" | 205 | ".previous\n" |
| 214 | ".section __ex_table,\"a\"\n" | 206 | _ASM_EXTABLE(1b,3b) |
| 215 | " .align 4\n" | ||
| 216 | " .long 1b, 3b\n" | ||
| 217 | ".previous" | ||
| 218 | : : "r" (from), "r" (to) : "memory"); | 207 | : : "r" (from), "r" (to) : "memory"); |
| 219 | from+=64; | 208 | from+=64; |
| 220 | to+=64; | 209 | to+=64; |
| @@ -311,10 +300,7 @@ static void fast_copy_page(void *to, void *from) | |||
| 311 | "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ | 300 | "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ |
| 312 | " jmp 2b\n" | 301 | " jmp 2b\n" |
| 313 | ".previous\n" | 302 | ".previous\n" |
| 314 | ".section __ex_table,\"a\"\n" | 303 | _ASM_EXTABLE(1b,3b) |
| 315 | " .align 4\n" | ||
| 316 | " .long 1b, 3b\n" | ||
| 317 | ".previous" | ||
| 318 | : : "r" (from) ); | 304 | : : "r" (from) ); |
| 319 | 305 | ||
| 320 | for(i=0; i<4096/64; i++) | 306 | for(i=0; i<4096/64; i++) |
| @@ -341,10 +327,7 @@ static void fast_copy_page(void *to, void *from) | |||
| 341 | "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ | 327 | "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ |
| 342 | " jmp 2b\n" | 328 | " jmp 2b\n" |
| 343 | ".previous\n" | 329 | ".previous\n" |
| 344 | ".section __ex_table,\"a\"\n" | 330 | _ASM_EXTABLE(1b,3b) |
| 345 | " .align 4\n" | ||
| 346 | " .long 1b, 3b\n" | ||
| 347 | ".previous" | ||
| 348 | : : "r" (from), "r" (to) : "memory"); | 331 | : : "r" (from), "r" (to) : "memory"); |
| 349 | from+=64; | 332 | from+=64; |
| 350 | to+=64; | 333 | to+=64; |