diff options
author | Jonathan Corbet <corbet@lwn.net> | 2018-04-27 17:13:20 -0600 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2018-04-27 17:13:20 -0600 |
commit | ccf2b067948a8f90fc3d7990c57283e7e404d004 (patch) | |
tree | 298e69b6f3e1eef45ac50ba68abe3dd175c4dc8c /arch/arm64/mm/kasan_init.c | |
parent | e27a20f104673f8ada70c5d32430a7f4c577fe95 (diff) | |
parent | 6d08b06e67cd117f6992c46611dfb4ce267cd71e (diff) |
Merge tag 'v4.17-rc2' into docs-next
Merge -rc2 to pick up the changes to
Documentation/core-api/kernel-api.rst that hit mainline via the
networking tree. In their absence, subsequent patches cannot be
applied.
Diffstat (limited to 'arch/arm64/mm/kasan_init.c')
-rw-r--r-- | arch/arm64/mm/kasan_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index dabfc1ecda3d..12145874c02b 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -204,7 +204,7 @@ void __init kasan_init(void) clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END); kasan_map_populate(kimg_shadow_start, kimg_shadow_end, - pfn_to_nid(virt_to_pfn(lm_alias(_text)))); + early_pfn_to_nid(virt_to_pfn(lm_alias(_text)))); kasan_populate_zero_shadow((void *)KASAN_SHADOW_START, (void *)mod_shadow_start); @@ -224,7 +224,7 @@ void __init kasan_init(void) kasan_map_populate((unsigned long)kasan_mem_to_shadow(start), (unsigned long)kasan_mem_to_shadow(end), - pfn_to_nid(virt_to_pfn(start))); + early_pfn_to_nid(virt_to_pfn(start))); } /* |