From: Lai Jiangshan <jiangshanlai@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: rcu@vger.kernel.org, x86@kernel.org,
Lai Jiangshan <jiangshan.ljs@antgroup.com>,
Andy Lutomirski <luto@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH V2 08/11] x86/entry: Merge thunk_64.S and thunk_32.S into thunk.S
Date: Sun, 7 Apr 2024 17:05:55 +0800 [thread overview]
Message-ID: <20240407090558.3395-9-jiangshanlai@gmail.com> (raw)
In-Reply-To: <20240407090558.3395-1-jiangshanlai@gmail.com>
From: Lai Jiangshan <jiangshan.ljs@antgroup.com>
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@antgroup.com>
---
arch/x86/entry/Makefile | 2 +-
arch/x86/entry/{thunk_64.S => thunk.S} | 0
arch/x86/entry/thunk_32.S | 18 ------------------
3 files changed, 1 insertion(+), 19 deletions(-)
rename arch/x86/entry/{thunk_64.S => thunk.S} (100%)
delete mode 100644 arch/x86/entry/thunk_32.S
diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile
index c93e7f5c2a06..ce1cc1622385 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_64.S b/arch/x86/entry/thunk.S
similarity index 100%
rename from arch/x86/entry/thunk_64.S
rename to arch/x86/entry/thunk.S
diff --git a/arch/x86/entry/thunk_32.S b/arch/x86/entry/thunk_32.S
deleted file mode 100644
index da37f42f4549..000000000000
--- 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)
-
--
2.19.1.6.gb485710b
next prev parent reply other threads:[~2024-04-07 9:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-07 9:05 [PATCH V2 00/11] rcu/x86: Use per-cpu rcu preempt count Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 01/11] lib: Use rcu_preempt_depth() to replace current->rcu_read_lock_nesting Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 02/11] rcu: Move rcu_preempt_depth_set() to rcupdate.h Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 03/11] rcu: Reorder tree_exp.h after tree_plugin.h Lai Jiangshan
2024-04-23 17:58 ` Joel Fernandes
2024-04-24 2:47 ` Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 04/11] rcu: Add macros set_rcu_preempt_special() and clear_rcu_preempt_special() Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 05/11] rcu: Make rcu_read_unlock_special() global Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 06/11] rcu: Rename marco __LINUX_RCU_H to __KERNEL_RCU_H Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 07/11] sched/core: Add rcu_preempt_switch() Lai Jiangshan
2024-04-07 9:05 ` Lai Jiangshan [this message]
2024-04-09 8:27 ` [tip: x86/entry] x86/entry: Merge thunk_64.S and thunk_32.S into thunk.S tip-bot2 for Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 09/11] rcu: Implement PCPU_RCU_PREEMPT_COUNT framework Lai Jiangshan
2024-04-23 18:19 ` Joel Fernandes
2024-04-24 3:02 ` Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 10/11] x86/rcu: Add rcu_preempt_count Lai Jiangshan
2024-04-23 18:09 ` Joel Fernandes
2024-04-24 2:53 ` Lai Jiangshan
2024-04-07 9:05 ` [PATCH V2 11/11] x86/rcu: Add THUNK rcu_read_unlock_special_thunk Lai Jiangshan
2024-04-23 17:26 ` Joel Fernandes
2024-04-24 2:43 ` Lai Jiangshan
2024-05-20 20:03 ` [PATCH V2 00/11] rcu/x86: Use per-cpu rcu preempt count Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240407090558.3395-9-jiangshanlai@gmail.com \
--to=jiangshanlai@gmail.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jiangshan.ljs@antgroup.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=rcu@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®