From: "tip-bot2 for Uros Bizjak" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: David Laight <david.laight.linux@gmail.com>,
Uros Bizjak <ubizjak@gmail.com>, Ingo Molnar <mingo@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/asm] x86/asm: Rename rep_nop() to native_pause()
Date: Fri, 18 Apr 2025 08:46:23 -0000 [thread overview]
Message-ID: <174496598375.31282.2315987383086713800.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250418080805.83679-1-ubizjak@gmail.com>
The following commit has been merged into the x86/asm branch of tip:
Commit-ID: 3ce4b1f1f24bbd9f1c349ecb6641dfa038bd0b5a
Gitweb: https://git.kernel.org/tip/3ce4b1f1f24bbd9f1c349ecb6641dfa038bd0b5a
Author: Uros Bizjak <ubizjak@gmail.com>
AuthorDate: Fri, 18 Apr 2025 10:07:43 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 18 Apr 2025 10:19:26 +02:00
x86/asm: Rename rep_nop() to native_pause()
Rename rep_nop() function to what it really does.
No functional change intended.
Suggested-by: David Laight <david.laight.linux@gmail.com>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Link: https://lore.kernel.org/r/20250418080805.83679-1-ubizjak@gmail.com
---
arch/x86/include/asm/vdso/processor.h | 4 ++--
arch/x86/kernel/apic/io_apic.c | 2 +-
arch/x86/lib/delay.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/vdso/processor.h b/arch/x86/include/asm/vdso/processor.h
index 240d761..7000aeb 100644
--- a/arch/x86/include/asm/vdso/processor.h
+++ b/arch/x86/include/asm/vdso/processor.h
@@ -8,14 +8,14 @@
#ifndef __ASSEMBLER__
/* PAUSE is a good thing to insert into busy-wait loops. */
-static __always_inline void rep_nop(void)
+static __always_inline void native_pause(void)
{
asm volatile("pause" ::: "memory");
}
static __always_inline void cpu_relax(void)
{
- rep_nop();
+ native_pause();
}
struct getcpu_cache;
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index eebc360..ba5a4cc 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1486,7 +1486,7 @@ static void __init delay_with_tsc(void)
* 1 GHz == 40 jiffies
*/
do {
- rep_nop();
+ native_pause();
now = rdtsc();
} while ((now - start) < 40000000000ULL / HZ && time_before_eq(jiffies, end));
}
diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c
index e86eda2..eb2d2e1 100644
--- a/arch/x86/lib/delay.c
+++ b/arch/x86/lib/delay.c
@@ -75,7 +75,7 @@ static void delay_tsc(u64 cycles)
/* Allow RT tasks to run */
preempt_enable();
- rep_nop();
+ native_pause();
preempt_disable();
/*
prev parent reply other threads:[~2025-04-18 8:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-18 8:07 [PATCH -tip v2 1/2] " Uros Bizjak
2025-04-18 8:07 ` [PATCH -tip v2 2/2] x86/asm: Replace "REP; NOP" with PAUSE mnemonic Uros Bizjak
2025-04-18 8:46 ` [tip: x86/asm] " tip-bot2 for Uros Bizjak
2025-04-18 8:46 ` tip-bot2 for Uros Bizjak [this message]
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=174496598375.31282.2315987383086713800.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=david.laight.linux@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=ubizjak@gmail.com \
--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®