Skip to content

Commit 31a568b

Browse files
torvaldstorvalds
committed
Merge tag 'x86-entry-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 entry cleanup from Ingo Molnar: - Merge thunk_64.S and thunk_32.S into thunk.S * tag 'x86-entry-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/entry: Merge thunk_64.S and thunk_32.S into thunk.S
2 parents ecd83bc + b767fe5 commit 31a568b

3 files changed

Lines changed: 1 addition & 19 deletions

File tree

‎arch/x86/entry/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ obj-y += common.o
1717
obj-y += vdso/
1818
obj-y += vsyscall/
1919

20-
obj-$(CONFIG_PREEMPTION) += thunk_$(BITS).o
20+
obj-$(CONFIG_PREEMPTION) += thunk.o
2121
CFLAGS_entry_fred.o += -fno-stack-protector
2222
CFLAGS_REMOVE_entry_fred.o += -pg $(CC_FLAGS_FTRACE)
2323
obj-$(CONFIG_X86_FRED) += entry_64_fred.o entry_fred.o

arch/x86/entry/thunk_64.S renamed to arch/x86/entry/thunk.S

File renamed without changes.

‎arch/x86/entry/thunk_32.S‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)