summaryrefslogtreecommitdiff
path: root/arch/powerpc/mm/kasan/init_32.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2024-02-21 09:57:35 +0300
committerDan Williams <dan.j.williams@intel.com>2024-02-21 09:57:35 +0300
commit40de53fd002c6ba087a623722915e8006ed68a02 (patch)
treeec733b0a05924f98855728cd24de2ea38e1223b8 /arch/powerpc/mm/kasan/init_32.c
parent0cab687205986491302cd2e440ef1d253031c221 (diff)
parentf3e6b3ae9cfc128af11b665c6ef4022ba2683778 (diff)
downloadlinux-40de53fd002c6ba087a623722915e8006ed68a02.tar.xz
Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl
Pick up CXL CPER notification removal for v6.8-rc6, to return in a later merge window.
Diffstat (limited to 'arch/powerpc/mm/kasan/init_32.c')
-rw-r--r--arch/powerpc/mm/kasan/init_32.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/kasan/init_32.c b/arch/powerpc/mm/kasan/init_32.c
index a70828a6d935..aa9aa11927b2 100644
--- a/arch/powerpc/mm/kasan/init_32.c
+++ b/arch/powerpc/mm/kasan/init_32.c
@@ -64,6 +64,7 @@ int __init __weak kasan_init_region(void *start, size_t size)
if (ret)
return ret;
+ k_start = k_start & PAGE_MASK;
block = memblock_alloc(k_end - k_start, PAGE_SIZE);
if (!block)
return -ENOMEM;