Skip to content

Commit 7077d2c

Browse files
sean-jchansendc
authored andcommitted
x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names
Rename the CPU entry area variables in kasan_init() to shorten their names, a future fix will reference the beginning of the per-CPU portion of the CPU entry area, and shadow_cpu_entry_per_cpu_begin is a bit much. No functional change intended. Signed-off-by: Sean Christopherson <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Andrey Ryabinin <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 9765014 commit 7077d2c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

arch/x86/mm/kasan_init_64.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid)
331331
void __init kasan_init(void)
332332
{
333333
int i;
334-
void *shadow_cpu_entry_begin, *shadow_cpu_entry_end;
334+
void *shadow_cea_begin, *shadow_cea_end;
335335

336336
memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt));
337337

@@ -372,16 +372,16 @@ void __init kasan_init(void)
372372
map_range(&pfn_mapped[i]);
373373
}
374374

375-
shadow_cpu_entry_begin = (void *)CPU_ENTRY_AREA_BASE;
376-
shadow_cpu_entry_begin = kasan_mem_to_shadow(shadow_cpu_entry_begin);
377-
shadow_cpu_entry_begin = (void *)round_down(
378-
(unsigned long)shadow_cpu_entry_begin, PAGE_SIZE);
375+
shadow_cea_begin = (void *)CPU_ENTRY_AREA_BASE;
376+
shadow_cea_begin = kasan_mem_to_shadow(shadow_cea_begin);
377+
shadow_cea_begin = (void *)round_down(
378+
(unsigned long)shadow_cea_begin, PAGE_SIZE);
379379

380-
shadow_cpu_entry_end = (void *)(CPU_ENTRY_AREA_BASE +
380+
shadow_cea_end = (void *)(CPU_ENTRY_AREA_BASE +
381381
CPU_ENTRY_AREA_MAP_SIZE);
382-
shadow_cpu_entry_end = kasan_mem_to_shadow(shadow_cpu_entry_end);
383-
shadow_cpu_entry_end = (void *)round_up(
384-
(unsigned long)shadow_cpu_entry_end, PAGE_SIZE);
382+
shadow_cea_end = kasan_mem_to_shadow(shadow_cea_end);
383+
shadow_cea_end = (void *)round_up(
384+
(unsigned long)shadow_cea_end, PAGE_SIZE);
385385

386386
kasan_populate_early_shadow(
387387
kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM),
@@ -403,9 +403,9 @@ void __init kasan_init(void)
403403

404404
kasan_populate_early_shadow(
405405
kasan_mem_to_shadow((void *)VMALLOC_END + 1),
406-
shadow_cpu_entry_begin);
406+
shadow_cea_begin);
407407

408-
kasan_populate_early_shadow(shadow_cpu_entry_end,
408+
kasan_populate_early_shadow(shadow_cea_end,
409409
kasan_mem_to_shadow((void *)__START_KERNEL_map));
410410

411411
kasan_populate_shadow((unsigned long)kasan_mem_to_shadow(_stext),

0 commit comments

Comments
 (0)