The following commit has been merged into the x86/entry branch of tip: Commit-ID: b767fe5de0b4a5057b070d8cdefdcf6740733d6e Gitweb: https://git.kernel.org/tip/b767fe5de0b4a5057b070d8cdefdcf6740733d6e Author: Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx> AuthorDate: Sun, 07 Apr 2024 17:05:55 +08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 09 Apr 2024 09:57:56 +02:00 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 <jiangshan.ljs@xxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Link: https://lore.kernel.org/r/20240407090558.3395-9-jiangshanlai@xxxxxxxxx --- arch/x86/entry/Makefile | 2 +- arch/x86/entry/thunk.S | 15 +++++++++++++++ arch/x86/entry/thunk_32.S | 18 ------------------ arch/x86/entry/thunk_64.S | 15 --------------- 4 files changed, 16 insertions(+), 34 deletions(-) create mode 100644 arch/x86/entry/thunk.S delete mode 100644 arch/x86/entry/thunk_32.S delete mode 100644 arch/x86/entry/thunk_64.S diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile index c93e7f5..ce1cc16 100644 --- a/arch/x86/entry/Makefile +++ b/arch/x86/entry/Makefile @@ -17,7 +17,7 @@ obj-y += common.o obj-y += vdso/ obj-y += vsyscall/ -obj-$(CONFIG_PREEMPTION) += thunk_$(BITS).o +obj-$(CONFIG_PREEMPTION) += thunk.o CFLAGS_entry_fred.o += -fno-stack-protector CFLAGS_REMOVE_entry_fred.o += -pg $(CC_FLAGS_FTRACE) obj-$(CONFIG_X86_FRED) += entry_64_fred.o entry_fred.o diff --git a/arch/x86/entry/thunk.S b/arch/x86/entry/thunk.S new file mode 100644 index 0000000..119ebdc --- /dev/null +++ b/arch/x86/entry/thunk.S @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Save registers before calling assembly functions. This avoids + * disturbance of register allocation in some inline assembly constructs. + * Copyright 2001,2002 by Andi Kleen, SuSE Labs. + */ +#include <linux/export.h> +#include <linux/linkage.h> +#include "calling.h" +#include <asm/asm.h> + +THUNK preempt_schedule_thunk, preempt_schedule +THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace +EXPORT_SYMBOL(preempt_schedule_thunk) +EXPORT_SYMBOL(preempt_schedule_notrace_thunk) diff --git a/arch/x86/entry/thunk_32.S b/arch/x86/entry/thunk_32.S deleted file mode 100644 index da37f42..0000000 --- a/arch/x86/entry/thunk_32.S +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Trampoline to trace irqs off. (otherwise CALLER_ADDR1 might crash) - * Copyright 2008 by Steven Rostedt, Red Hat, Inc - * (inspired by Andi Kleen's thunk_64.S) - */ - -#include <linux/export.h> -#include <linux/linkage.h> -#include <asm/asm.h> - -#include "calling.h" - -THUNK preempt_schedule_thunk, preempt_schedule -THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace -EXPORT_SYMBOL(preempt_schedule_thunk) -EXPORT_SYMBOL(preempt_schedule_notrace_thunk) - diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S deleted file mode 100644 index 119ebdc..0000000 --- a/arch/x86/entry/thunk_64.S +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Save registers before calling assembly functions. This avoids - * disturbance of register allocation in some inline assembly constructs. - * Copyright 2001,2002 by Andi Kleen, SuSE Labs. - */ -#include <linux/export.h> -#include <linux/linkage.h> -#include "calling.h" -#include <asm/asm.h> - -THUNK preempt_schedule_thunk, preempt_schedule -THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace -EXPORT_SYMBOL(preempt_schedule_thunk) -EXPORT_SYMBOL(preempt_schedule_notrace_thunk)
|