Skip to content

Commit b767fe5

Browse files
Lai JiangshanIngo Molnar
authored andcommitted
x86/entry: Merge thunk_64.S and thunk_32.S into thunk.S
The code in thunk_64.S and thunk_32.S are exactly the same except for the comments. Merge them in to thunk.S. And since thunk_32.S was originated from thunk_64.S, the new merged thunk.S is actually renamed from thunk_64.S. Signed-off-by: Lai Jiangshan <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent fec50db commit b767fe5

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

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
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)