2021-04-27 06:39:45

by Jiabing Wan

Subject: [PATCH] x86/smpboot: Remove duplicate includes

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 <[email protected]>
---
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

2021-05-06 12:18:03

by tip-bot2 for Haifeng Xu

Subject: [tip: x86/urgent] x86/smpboot: Remove duplicate includes

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 <[email protected]>
AuthorDate: Tue, 27 Apr 2021 14:38:26 +08:00
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Wed, 05 May 2021 21:50:13 +02:00

x86/smpboot: Remove duplicate includes

Signed-off-by: Wan Jiabing <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

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