]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/boot: Use __ALIGN_KERNEL_MASK() instead of open coded analogue
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 4 Apr 2025 16:53:03 +0000 (19:53 +0300)
committerIngo Molnar <mingo@kernel.org>
Sun, 6 Apr 2025 18:06:36 +0000 (20:06 +0200)
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20250404165303.3657139-1-andriy.shevchenko@linux.intel.com
arch/x86/include/asm/page_types.h

index 9f77bf03d747258e5d4d427be372f6f4754b65a7..018a8d906ca3590ab793966d4fe290e2c3ed61ed 100644 (file)
@@ -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)