diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 14:06:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 14:06:52 -0700 |
| commit | 3dd1f7447f4f989b3a348cdc347b15397d03bebc (patch) | |
| tree | d13c71ec4a9234af54cfc321a6a94ed21c24fd06 /arch/x86/kernel/vmlinux.lds.S | |
| parent | 09d639f1f1f6347eb28802799a2187ae540b00ba (diff) | |
| parent | f6cff820877ff34839920ff9de9b912359cfb607 (diff) | |
Merge tag 'x86-build-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build update from Ingo Molnar:
- Only align ENTRY_TEXT to PMD_SIZE if necessary (Hamza Mahfooz)
* tag 'x86-build-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/build: Only align ENTRY_TEXT to PMD_SIZE if necessary
Diffstat (limited to 'arch/x86/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 74e336d7f9dd..10caf92d075d 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -65,9 +65,15 @@ const_cpu_current_top_of_stack = cpu_current_top_of_stack; __end_rodata_hpage_align = .; \ __end_rodata_aligned = .; +#if defined(CONFIG_MITIGATION_PAGE_TABLE_ISOLATION) || defined(CONFIG_MITIGATION_SRSO) #define ALIGN_ENTRY_TEXT_BEGIN . = ALIGN(PMD_SIZE); #define ALIGN_ENTRY_TEXT_END . = ALIGN(PMD_SIZE); #else +#define ALIGN_ENTRY_TEXT_BEGIN +#define ALIGN_ENTRY_TEXT_END +#endif + +#else #define X86_ALIGN_RODATA_BEGIN #define X86_ALIGN_RODATA_END \ |