summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2019-04-26 18:23:35 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2019-05-02 17:20:26 +0200
commit72f208c6a8f7bc78ef5248babd9e6ed6302bd2a0 (patch)
tree188de1b1f6237776858d75160c0310df3654eef8 /arch/powerpc/kernel
parentpowerpc/32: Add KASAN support (diff)
downloadlinux-72f208c6a8f7bc78ef5248babd9e6ed6302bd2a0.tar.xz
linux-72f208c6a8f7bc78ef5248babd9e6ed6302bd2a0.zip
powerpc/32s: move hash code patching out of MMU_init_hw()
For KASAN, hash table handling will be activated early for accessing to KASAN shadow areas. In order to avoid any modification of the hash functions while they are still used with the early hash table, the code patching is moved out of MMU_init_hw() and put close to the big-bang switch to the final hash table. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/head_32.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 6e85171e513c..5958ea685968 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -977,6 +977,9 @@ start_here:
bl machine_init
bl __save_cpu_setup
bl MMU_init
+BEGIN_MMU_FTR_SECTION
+ bl MMU_init_hw_patch
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
/*
* Go back to running unmapped so we can load up new values