diff options
| -rw-r--r-- | arch/microblaze/kernel/misc.S | 11 | ||||
| -rw-r--r-- | arch/microblaze/lib/fastcopy.S | 6 | ||||
| -rw-r--r-- | arch/microblaze/lib/uaccess_old.S | 6 |
3 files changed, 22 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/misc.S b/arch/microblaze/kernel/misc.S index df16c6287a8e..18681eed5ec7 100644 --- a/arch/microblaze/kernel/misc.S +++ b/arch/microblaze/kernel/misc.S | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * We avoid flushing the pinned 0, 1 and possibly 2 entries. | 26 | * We avoid flushing the pinned 0, 1 and possibly 2 entries. |
| 27 | */ | 27 | */ |
| 28 | .globl _tlbia; | 28 | .globl _tlbia; |
| 29 | .type _tlbia, @function | ||
| 29 | .align 4; | 30 | .align 4; |
| 30 | _tlbia: | 31 | _tlbia: |
| 31 | addik r12, r0, 63 /* flush all entries (63 - 3) */ | 32 | addik r12, r0, 63 /* flush all entries (63 - 3) */ |
| @@ -41,11 +42,13 @@ _tlbia_1: | |||
| 41 | /* sync */ | 42 | /* sync */ |
| 42 | rtsd r15, 8 | 43 | rtsd r15, 8 |
| 43 | nop | 44 | nop |
| 45 | .size _tlbia, . - _tlbia | ||
| 44 | 46 | ||
| 45 | /* | 47 | /* |
| 46 | * Flush MMU TLB for a particular address (in r5) | 48 | * Flush MMU TLB for a particular address (in r5) |
| 47 | */ | 49 | */ |
| 48 | .globl _tlbie; | 50 | .globl _tlbie; |
| 51 | .type _tlbie, @function | ||
| 49 | .align 4; | 52 | .align 4; |
| 50 | _tlbie: | 53 | _tlbie: |
| 51 | mts rtlbsx, r5 /* look up the address in TLB */ | 54 | mts rtlbsx, r5 /* look up the address in TLB */ |
| @@ -59,10 +62,13 @@ _tlbie_1: | |||
| 59 | rtsd r15, 8 | 62 | rtsd r15, 8 |
| 60 | nop | 63 | nop |
| 61 | 64 | ||
| 65 | .size _tlbie, . - _tlbie | ||
| 66 | |||
| 62 | /* | 67 | /* |
| 63 | * Allocate TLB entry for early console | 68 | * Allocate TLB entry for early console |
| 64 | */ | 69 | */ |
| 65 | .globl early_console_reg_tlb_alloc; | 70 | .globl early_console_reg_tlb_alloc; |
| 71 | .type early_console_reg_tlb_alloc, @function | ||
| 66 | .align 4; | 72 | .align 4; |
| 67 | early_console_reg_tlb_alloc: | 73 | early_console_reg_tlb_alloc: |
| 68 | /* | 74 | /* |
| @@ -86,6 +92,8 @@ early_console_reg_tlb_alloc: | |||
| 86 | rtsd r15, 8 | 92 | rtsd r15, 8 |
| 87 | nop | 93 | nop |
| 88 | 94 | ||
| 95 | .size early_console_reg_tlb_alloc, . - early_console_reg_tlb_alloc | ||
| 96 | |||
| 89 | /* | 97 | /* |
| 90 | * Copy a whole page (4096 bytes). | 98 | * Copy a whole page (4096 bytes). |
| 91 | */ | 99 | */ |
| @@ -104,6 +112,7 @@ early_console_reg_tlb_alloc: | |||
| 104 | #define DCACHE_LINE_BYTES (4 * 4) | 112 | #define DCACHE_LINE_BYTES (4 * 4) |
| 105 | 113 | ||
| 106 | .globl copy_page; | 114 | .globl copy_page; |
| 115 | .type copy_page, @function | ||
| 107 | .align 4; | 116 | .align 4; |
| 108 | copy_page: | 117 | copy_page: |
| 109 | ori r11, r0, (PAGE_SIZE/DCACHE_LINE_BYTES) - 1 | 118 | ori r11, r0, (PAGE_SIZE/DCACHE_LINE_BYTES) - 1 |
| @@ -118,3 +127,5 @@ _copy_page_loop: | |||
| 118 | addik r11, r11, -1 | 127 | addik r11, r11, -1 |
| 119 | rtsd r15, 8 | 128 | rtsd r15, 8 |
| 120 | nop | 129 | nop |
| 130 | |||
| 131 | .size copy_page, . - copy_page | ||
diff --git a/arch/microblaze/lib/fastcopy.S b/arch/microblaze/lib/fastcopy.S index 02e3ab4eddf3..fdc48bb065d8 100644 --- a/arch/microblaze/lib/fastcopy.S +++ b/arch/microblaze/lib/fastcopy.S | |||
| @@ -30,8 +30,9 @@ | |||
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/linkage.h> | 32 | #include <linux/linkage.h> |
| 33 | 33 | .text | |
| 34 | .globl memcpy | 34 | .globl memcpy |
| 35 | .type memcpy, @function | ||
| 35 | .ent memcpy | 36 | .ent memcpy |
| 36 | 37 | ||
| 37 | memcpy: | 38 | memcpy: |
| @@ -345,9 +346,11 @@ a_done: | |||
| 345 | rtsd r15, 8 | 346 | rtsd r15, 8 |
| 346 | nop | 347 | nop |
| 347 | 348 | ||
| 349 | .size memcpy, . - memcpy | ||
| 348 | .end memcpy | 350 | .end memcpy |
| 349 | /*----------------------------------------------------------------------------*/ | 351 | /*----------------------------------------------------------------------------*/ |
| 350 | .globl memmove | 352 | .globl memmove |
| 353 | .type memmove, @function | ||
| 351 | .ent memmove | 354 | .ent memmove |
| 352 | 355 | ||
| 353 | memmove: | 356 | memmove: |
| @@ -659,4 +662,5 @@ d_done: | |||
| 659 | rtsd r15, 8 | 662 | rtsd r15, 8 |
| 660 | nop | 663 | nop |
| 661 | 664 | ||
| 665 | .size memmove, . - memmove | ||
| 662 | .end memmove | 666 | .end memmove |
diff --git a/arch/microblaze/lib/uaccess_old.S b/arch/microblaze/lib/uaccess_old.S index 67f991c14b8a..b327524a8032 100644 --- a/arch/microblaze/lib/uaccess_old.S +++ b/arch/microblaze/lib/uaccess_old.S | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | .text | 23 | .text |
| 24 | .globl __strncpy_user; | 24 | .globl __strncpy_user; |
| 25 | .type __strncpy_user, @function | ||
| 25 | .align 4; | 26 | .align 4; |
| 26 | __strncpy_user: | 27 | __strncpy_user: |
| 27 | 28 | ||
| @@ -50,6 +51,7 @@ __strncpy_user: | |||
| 50 | 3: | 51 | 3: |
| 51 | rtsd r15,8 | 52 | rtsd r15,8 |
| 52 | nop | 53 | nop |
| 54 | .size __strncpy_user, . - __strncpy_user | ||
| 53 | 55 | ||
| 54 | 56 | ||
| 55 | .section .fixup, "ax" | 57 | .section .fixup, "ax" |
| @@ -72,6 +74,7 @@ __strncpy_user: | |||
| 72 | 74 | ||
| 73 | .text | 75 | .text |
| 74 | .globl __strnlen_user; | 76 | .globl __strnlen_user; |
| 77 | .type __strnlen_user, @function | ||
| 75 | .align 4; | 78 | .align 4; |
| 76 | __strnlen_user: | 79 | __strnlen_user: |
| 77 | addik r3,r6,0 | 80 | addik r3,r6,0 |
| @@ -90,6 +93,7 @@ __strnlen_user: | |||
| 90 | 3: | 93 | 3: |
| 91 | rtsd r15,8 | 94 | rtsd r15,8 |
| 92 | nop | 95 | nop |
| 96 | .size __strnlen_user, . - __strnlen_user | ||
| 93 | 97 | ||
| 94 | 98 | ||
| 95 | .section .fixup,"ax" | 99 | .section .fixup,"ax" |
| @@ -108,6 +112,7 @@ __strnlen_user: | |||
| 108 | */ | 112 | */ |
| 109 | .text | 113 | .text |
| 110 | .globl __copy_tofrom_user; | 114 | .globl __copy_tofrom_user; |
| 115 | .type __copy_tofrom_user, @function | ||
| 111 | .align 4; | 116 | .align 4; |
| 112 | __copy_tofrom_user: | 117 | __copy_tofrom_user: |
| 113 | /* | 118 | /* |
| @@ -129,6 +134,7 @@ __copy_tofrom_user: | |||
| 129 | 3: | 134 | 3: |
| 130 | rtsd r15,8 | 135 | rtsd r15,8 |
| 131 | nop | 136 | nop |
| 137 | .size __copy_tofrom_user, . - __copy_tofrom_user | ||
| 132 | 138 | ||
| 133 | 139 | ||
| 134 | .section __ex_table,"a" | 140 | .section __ex_table,"a" |
