Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp1302108pxy; Thu, 6 May 2021 05:18:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTASjqlym5jHMn8ZLr/Kn33H17CKxQ8eXGXp+/D7arDap74XpTpJ/+1KAvXUFBt8x16Nal X-Received: by 2002:a17:906:f01:: with SMTP id z1mr3949299eji.535.1620303482868; Thu, 06 May 2021 05:18:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620303482; cv=none; d=google.com; s=arc-20160816; b=fl7FtJ7CN33qlTWoRFa2GIGTLViU4jkA/w3gZSNrsshIiJeIVfTpbEJXGZMNcp5Pw3 eP6EKVp8+KbcJKWyTfLnXngcWh04ZpWaTkNtfsbuB9s3j/LoPXYwkgMV2Po3LhcJXYbi fw1kePqmxXd1/36gDZtiN9/0Yv72L6Sduhqeifw5rae+7961yqhGgGQm2zaO/k/8/kp2 cjwqjksvjyOJg0TVLSZbQ2LziIUPt3WWb8lBMu88wcmOt7kT6ievW04jgtxYW5N6L/9V joui7lnsoIC0p8xjO6sVXLP13NKRmU0a6xPv8GYnrK8y/iz390RsoSU62HN1utP1ZYMK p0OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=1frjhNAPdWu6iknMPF4As0BhSenaX59gl6MM1luhtVs=; b=uYSR1kfJsOo4udokS78oQQSadBKXKGujSXvP2lfbPU79O89AJXReGbM0M0Oppq0oQB /nrWmSEjq+Xhl442jpxYLlvodNYp1RaAiJjuBb2INO5x+OUJoZoxXbhqGgkRohOBKr6g jFEMSnMr6J1SSGwFZt526OC4gqrHX/FA4VtsAtir2pUKwgBwaFBf3TwH30kWf3kCfqz5 I+aZ0m+RmiavH7Z2okoe2wqUV7PbIsGZmU2uG/XOzcOIiQfQrJw6YoHb/8vGeKtTXPPx pcI2KdO2rtP5nutDI3l0ehmQ2s8TyTnn0ueZ0EKhXp54lcfS9Gs/5R4J0+5IPZfG25sg K4rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=OYnZSium; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s2si2147777edr.28.2021.05.06.05.17.36; Thu, 06 May 2021 05:18:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=OYnZSium; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233878AbhEFMP7 (ORCPT + 99 others); Thu, 6 May 2021 08:15:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233051AbhEFMPI (ORCPT ); Thu, 6 May 2021 08:15:08 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73224C061761; Thu, 6 May 2021 05:14:10 -0700 (PDT) Date: Thu, 06 May 2021 12:14:08 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1620303249; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1frjhNAPdWu6iknMPF4As0BhSenaX59gl6MM1luhtVs=; b=OYnZSiumvcH7WUHtqm2pdpbtnssmhL6G05Ui/8b03CEAgEX80tTMBGqUDtp6Z9nqJbQ93W VD0DWa/NCp3qxh/T7ajULdEN2wCIt1nnfVRxjJmxc7phoWCuwJpd8s0S8pxoCvMxqM5dE1 9XaFeRKYqaiLZU0a6UBRoqGPrAKy9Y63a8a7Q2uZD+eTLT7eO8Vh6O7fDmNPwwx4AXP4sC PushOcAXUkNd4Em3F38g2L8sxmvHgDheiaIdktMUjOHkTRTc4exRvNkrRYXzf47QfvDBJV hqvnup2XfbEZmAoxPBftqjyplNfGKZ1MpjgCWFi1dsh1gy98El8CYjVh3L1QAg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1620303249; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1frjhNAPdWu6iknMPF4As0BhSenaX59gl6MM1luhtVs=; b=XxQ+s4pfaKNAzMb79PnLf4gVDbDT4iIW/sY//ORPLcYD25d0MOfkMc5C8z8g2MAUdITVFc HZlLyWym3yonxuDA== From: "tip-bot2 for Wan Jiabing" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/smpboot: Remove duplicate includes Cc: Wan Jiabing , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210427063835.9039-1-wanjiabing@vivo.com> References: <20210427063835.9039-1-wanjiabing@vivo.com> MIME-Version: 1.0 Message-ID: <162030324849.29796.7973695577093488360.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 AuthorDate: Tue, 27 Apr 2021 14:38:26 +08:00 Committer: Thomas Gleixner CommitterDate: Wed, 05 May 2021 21:50:13 +02:00 x86/smpboot: Remove duplicate includes Signed-off-by: Wan Jiabing Signed-off-by: Thomas Gleixner 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 -#include - #define X86_MATCH(model) \ X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \ INTEL_FAM6_##model, X86_FEATURE_APERFMPERF, NULL)