Commit 0ee07a07 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar
Browse files

x86/boot: Use __ALIGN_KERNEL_MASK() instead of open coded analogue 



LOAD_PHYSICAL_ADDR is calculated as an aligned (up) CONFIG_PHYSICAL_START
with the respective alignment value CONFIG_PHYSICAL_ALIGN. However,
the code is written openly while we have __ALIGN_KERNEL_MASK() macro
that does the same. This macro has nothing special, that's why
it may be used in assembler code or linker scripts (on the contrary
__ALIGN_KERNEL() may not). Do it so.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20250404165303.3657139-1-andriy.shevchenko@linux.intel.com
parent dda88878

arch/x86/include/asm/page_types.h

+1 −3
Original line number Diff line number Diff line
@@ -29,9 +29,7 @@ 
#define VM_DATA_DEFAULT_FLAGS	VM_DATA_FLAGS_TSK_EXEC



/* Physical address where kernel should be loaded. */

#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \

				+ (CONFIG_PHYSICAL_ALIGN - 1)) \

				& ~(CONFIG_PHYSICAL_ALIGN - 1))

#define LOAD_PHYSICAL_ADDR	__ALIGN_KERNEL_MASK(CONFIG_PHYSICAL_START, CONFIG_PHYSICAL_ALIGN - 1)



#define __START_KERNEL		(__START_KERNEL_map + LOAD_PHYSICAL_ADDR)