diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-03-10 07:16:42 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-03-10 07:16:42 +0300 |
| commit | 819723a8a2fb66678fe15d177ae56af38163f364 (patch) | |
| tree | ab51b2cc5555cbf5f1899432b923995e41647633 /arch/powerpc/mm/kasan/kasan_init_32.c | |
| parent | 247257b03b04398ca07da4bce3d17bee25d623cb (diff) | |
| parent | 59bee45b9712c759ea4d3dcc4eff1752f3a66558 (diff) | |
| download | linux-819723a8a2fb66678fe15d177ae56af38163f364.tar.xz | |
Merge branch 'fixes' into next
Merge in our fixes branch. In particular we want to merge the TM and KUAP fixes,
so we can add selftests for them in next.
Diffstat (limited to 'arch/powerpc/mm/kasan/kasan_init_32.c')
| -rw-r--r-- | arch/powerpc/mm/kasan/kasan_init_32.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/mm/kasan/kasan_init_32.c b/arch/powerpc/mm/kasan/kasan_init_32.c index b195d085970a..f19526e7d3dc 100644 --- a/arch/powerpc/mm/kasan/kasan_init_32.c +++ b/arch/powerpc/mm/kasan/kasan_init_32.c @@ -185,8 +185,7 @@ u8 __initdata early_hash[256 << 10] __aligned(256 << 10) = {0}; static void __init kasan_early_hash_table(void) { - unsigned int hash = IS_ENABLED(CONFIG_VMAP_STACK) ? (unsigned int)early_hash : - __pa(early_hash); + unsigned int hash = __pa(early_hash); modify_instruction_site(&patch__hash_page_A0, 0xffff, hash >> 16); modify_instruction_site(&patch__flush_hash_A0, 0xffff, hash >> 16); |