* [PATCH] x86/smpboot: Remove duplicate includes
@ 2021-04-27 6:38 Wan Jiabing
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Wan Jiabing
0 siblings, 1 reply; 2+ messages in thread
From: Wan Jiabing @ 2021-04-27 6:38 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, x86,
H. Peter Anvin, Peter Zijlstra (Intel),
Giovanni Gherdovich, Rafael J. Wysocki, Mike Rapoport,
Vitaly Kuznetsov, Nathan Fontenot, Ashok Raj, Brian Gerst,
linux-kernel
Cc: kael_w, Wan Jiabing
asm/intel-family.h is included at line 80.
asm/cpu_device_id.h is included at line 81.
Remove duplicate includes here.
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
arch/x86/kernel/smpboot.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 1e2050c4f94a..c1c1bd1ab921 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1863,9 +1863,6 @@ static bool slv_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq)
return true;
}
-#include <asm/cpu_device_id.h>
-#include <asm/intel-family.h>
-
#define X86_MATCH(model) \
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \
INTEL_FAM6_##model, X86_FEATURE_APERFMPERF, NULL)
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/urgent] x86/smpboot: Remove duplicate includes
2021-04-27 6:38 [PATCH] x86/smpboot: Remove duplicate includes Wan Jiabing
@ 2021-05-06 12:14 ` tip-bot2 for Wan Jiabing
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Wan Jiabing @ 2021-05-06 12:14 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Wan Jiabing, Thomas Gleixner, x86, linux-kernel
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 3cf4524ce40b204418537e6a3a55ed44911b3f53
Gitweb: https://git.kernel.org/tip/3cf4524ce40b204418537e6a3a55ed44911b3f53
Author: Wan Jiabing <wanjiabing@vivo.com>
AuthorDate: Tue, 27 Apr 2021 14:38:26 +08:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 05 May 2021 21:50:13 +02:00
x86/smpboot: Remove duplicate includes
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210427063835.9039-1-wanjiabing@vivo.com
---
arch/x86/kernel/smpboot.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 7ffb0cf..0ad5214 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1865,9 +1865,6 @@ static bool slv_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq)
return true;
}
-#include <asm/cpu_device_id.h>
-#include <asm/intel-family.h>
-
#define X86_MATCH(model) \
X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \
INTEL_FAM6_##model, X86_FEATURE_APERFMPERF, NULL)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-06 12:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-27 6:38 [PATCH] x86/smpboot: Remove duplicate includes Wan Jiabing
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Wan Jiabing
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).