linux-kernel - [tip: x86/urgent] x86/smpboot: Remove duplicate includes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <162030324849.29796.7973695577093488360.tip-bot2@tip-bot2>
Date:   Thu, 06 May 2021 12:14:08 -0000
From:   "tip-bot2 for Wan Jiabing" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Wan Jiabing <wanjiabing@...o.com>,
        Thomas Gleixner <tglx@...utronix.de>, x86@...nel.org,
        linux-kernel@...r.kernel.org
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 <wanjiabing@...o.com>
AuthorDate:    Tue, 27 Apr 2021 14:38:26 +08:00
Committer:     Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Wed, 05 May 2021 21:50:13 +02:00

x86/smpboot: Remove duplicate includes

Signed-off-by: Wan Jiabing <wanjiabing@...o.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.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)