From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58465C76190 for ; Mon, 22 Jul 2019 18:58:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BCC821E6B for ; Mon, 22 Jul 2019 18:58:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731950AbfGVS5F (ORCPT ); Mon, 22 Jul 2019 14:57:05 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:38046 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728890AbfGVS5D (ORCPT ); Mon, 22 Jul 2019 14:57:03 -0400 Received: from localhost ([127.0.0.1] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1hpdUb-0002P3-4m; Mon, 22 Jul 2019 20:57:01 +0200 Message-Id: <20190722105219.342631201@linutronix.de> User-Agent: quilt/0.65 Date: Mon, 22 Jul 2019 20:47:11 +0200 From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Nadav Amit , Ricardo Neri , Stephane Eranian , Feng Tang , Andrew Cooper Subject: [patch V3 06/25] x86/apic: Cleanup the include maze References: <20190722104705.550071814@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All of these APIC files include the world and some more. Remove the unneeded cruft. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/apic_flat_64.c | 15 ++++----------- arch/x86/kernel/apic/apic_noop.c | 18 +----------------- arch/x86/kernel/apic/apic_numachip.c | 6 +++--- arch/x86/kernel/apic/ipi.c | 15 +-------------- arch/x86/kernel/apic/probe_32.c | 18 ++---------------- arch/x86/kernel/apic/probe_64.c | 11 ----------- arch/x86/kernel/apic/x2apic_cluster.c | 14 ++++++-------- arch/x86/kernel/apic/x2apic_phys.c | 9 +++------ arch/x86/kernel/apic/x2apic_uv_x.c | 28 ++++------------------------ 9 files changed, 24 insertions(+), 110 deletions(-) --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -8,21 +8,14 @@ * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and * James Cleverdon. */ -#include -#include -#include #include -#include -#include -#include -#include #include +#include -#include -#include -#include -#include #include +#include +#include +#include static struct apic apic_physflat; static struct apic apic_flat; --- a/arch/x86/kernel/apic/apic_noop.c +++ b/arch/x86/kernel/apic/apic_noop.c @@ -9,25 +9,9 @@ * to not uglify the caller's code and allow to call (some) apic routines * like self-ipi, etc... */ - -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include static void noop_init_apic_ldr(void) { } static void noop_send_IPI(int cpu, int vector) { } --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -10,15 +10,15 @@ * Send feedback to * */ - +#include #include #include #include -#include + #include #include -#include +#include u8 numachip_system __read_mostly; static const struct apic apic_numachip1; --- a/arch/x86/kernel/apic/ipi.c +++ b/arch/x86/kernel/apic/ipi.c @@ -1,21 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include -#include -#include -#include -#include #include -#include #include void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest) --- a/arch/x86/kernel/apic/probe_32.c +++ b/arch/x86/kernel/apic/probe_32.c @@ -6,26 +6,12 @@ * * Generic x86 APIC driver probe layer. */ -#include -#include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include - -#include -#include -#include +#include #include -#include +#include #ifdef CONFIG_HOTPLUG_CPU #define DEFAULT_SEND_IPI (1) --- a/arch/x86/kernel/apic/probe_64.c +++ b/arch/x86/kernel/apic/probe_64.c @@ -8,19 +8,8 @@ * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and * James Cleverdon. */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include #include -#include /* * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c @@ -1,14 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 -#include + +#include #include -#include -#include -#include -#include -#include -#include +#include +#include + +#include -#include #include "x2apic.h" struct cluster_mask { --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c @@ -1,13 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 -#include + #include -#include -#include -#include -#include +#include -#include #include + #include "x2apic.h" int x2apic_phys; --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -7,40 +7,20 @@ * * Copyright (C) 2007-2014 Silicon Graphics, Inc. All rights reserved. */ +#include +#include #include -#include #include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include +#include #include #include -#include -#include #include #include #include -#include -#include -#include -#include -#include DEFINE_PER_CPU(int, x2apic_extra_bits);