Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/32s: Make Hash var static

Browse Source 
Hash var is used only locally in mmu.c now.

No need to set it in head_32.S anymore.

Make it static and initialises it to the early hash table.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/786c82a89cdfdaabb32b72a44f7c312fa81d192b.1603348103.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2020-10-22 06:29:31 +00:00 committed by Michael Ellerman
parent 4cc445b4ff
commit 4b74a35fc7
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/head_book3s_32.S
View File

@ -155,10 +155,8 @@ __after_mmu_off:
bl initial_bats bl initial_bats
bl load_segment_registers bl load_segment_registers
BEGIN_MMU_FTR_SECTION
bl reloc_offset bl reloc_offset
bl early_hash_table bl early_hash_table
END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
#if defined(CONFIG_BOOTX_TEXT) #if defined(CONFIG_BOOTX_TEXT)
bl setup_disp_bat bl setup_disp_bat
#endif #endif
@ -922,9 +920,6 @@ early_hash_table:
lis r6, early_hash - PAGE_OFFSET@h lis r6, early_hash - PAGE_OFFSET@h
ori r6, r6, 3 /* 256kB table */ ori r6, r6, 3 /* 256kB table */
mtspr SPRN_SDR1, r6 mtspr SPRN_SDR1, r6
lis r6, early_hash@h
addis r3, r3, Hash@ha
stw r6, Hash@l(r3)
blr blr
load_up_mmu: load_up_mmu:

2
arch/powerpc/mm/book3s32/mmu.c
View File

@ -33,7 +33,7 @@
u8 __initdata early_hash[SZ_256K] __aligned(SZ_256K) = {0}; u8 __initdata early_hash[SZ_256K] __aligned(SZ_256K) = {0};
struct hash_pte *Hash; static struct hash_pte *Hash = (struct hash_pte *)early_hash;
static unsigned long Hash_size, Hash_mask; static unsigned long Hash_size, Hash_mask;
unsigned long _SDR1; unsigned long _SDR1;
static unsigned int hash_mb, hash_mb2; static unsigned int hash_mb, hash_mb2;

1
arch/powerpc/mm/mmu_decl.h
View File

@ -99,7 +99,6 @@ extern int __map_without_bats;
extern unsigned int rtas_data, rtas_size; extern unsigned int rtas_data, rtas_size;
struct hash_pte; struct hash_pte;
extern struct hash_pte *Hash;
extern u8 early_hash[]; extern u8 early_hash[];
#endif /* CONFIG_PPC32 */ #endif /* CONFIG_PPC32 */