diff options
author | Helge Deller <deller@gmx.de> | 2018-04-10 12:55:13 -0400 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2018-04-11 05:40:35 -0400 |
commit | 2a03bb9e7af2052ad6990bf417a3ba9ff7e8900e (patch) | |
tree | f11b00c1def7b851208352b5d436b81179a06849 | |
parent | 75abf64287cab73546382a4fa7fa2f4e3516efeb (diff) |
parisc: Move cache flush functions into .text.hot section
and move the disable_sr_hashing() C and assembly functions into the
.init section.
Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r-- | arch/parisc/kernel/cache.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/pacache.S | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index a99da95fc9fd..bddd2acebdcc 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c | |||
@@ -254,7 +254,7 @@ parisc_cache_init(void) | |||
254 | } | 254 | } |
255 | } | 255 | } |
256 | 256 | ||
257 | void disable_sr_hashing(void) | 257 | void __init disable_sr_hashing(void) |
258 | { | 258 | { |
259 | int srhash_type, retval; | 259 | int srhash_type, retval; |
260 | unsigned long space_bits; | 260 | unsigned long space_bits; |
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index 67b0f7532e83..22e6374ece44 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
@@ -38,9 +38,10 @@ | |||
38 | #include <asm/cache.h> | 38 | #include <asm/cache.h> |
39 | #include <asm/ldcw.h> | 39 | #include <asm/ldcw.h> |
40 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
41 | #include <linux/init.h> | ||
41 | 42 | ||
42 | .text | 43 | .section .text.hot |
43 | .align 128 | 44 | .align 16 |
44 | 45 | ||
45 | ENTRY_CFI(flush_tlb_all_local) | 46 | ENTRY_CFI(flush_tlb_all_local) |
46 | .proc | 47 | .proc |
@@ -328,8 +329,6 @@ fdsync: | |||
328 | .procend | 329 | .procend |
329 | ENDPROC_CFI(flush_data_cache_local) | 330 | ENDPROC_CFI(flush_data_cache_local) |
330 | 331 | ||
331 | .align 16 | ||
332 | |||
333 | /* Macros to serialize TLB purge operations on SMP. */ | 332 | /* Macros to serialize TLB purge operations on SMP. */ |
334 | 333 | ||
335 | .macro tlb_lock la,flags,tmp | 334 | .macro tlb_lock la,flags,tmp |
@@ -1216,6 +1215,8 @@ ENTRY_CFI(flush_kernel_icache_range_asm) | |||
1216 | .procend | 1215 | .procend |
1217 | ENDPROC_CFI(flush_kernel_icache_range_asm) | 1216 | ENDPROC_CFI(flush_kernel_icache_range_asm) |
1218 | 1217 | ||
1218 | __INIT | ||
1219 | |||
1219 | /* align should cover use of rfi in disable_sr_hashing_asm and | 1220 | /* align should cover use of rfi in disable_sr_hashing_asm and |
1220 | * srdis_done. | 1221 | * srdis_done. |
1221 | */ | 1222 | */ |