From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752241AbdJSK4K (ORCPT ); Thu, 19 Oct 2017 06:56:10 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:64707 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751836AbdJSK4I (ORCPT ); Thu, 19 Oct 2017 06:56:08 -0400 From: Arnd Bergmann To: Thomas Gleixner , x86@kernel.org Cc: y2038@lists.linaro.org, Arnd Bergmann , Ingo Molnar , "H. Peter Anvin" , Joerg Roedel , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Subject: [PATCH 1/2] x86: don't include asm/x86_init.h in asm/setup.h Date: Thu, 19 Oct 2017 12:53:02 +0200 Message-Id: <20171019105451.2892046-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:byJraYOHXg2yjSBwwhVpBAbc8F11y2g2RiP3n2u3EVu3/tg5FF9 haJ5ChluDrJG8bugu9lEnYa0G3NVvIsKs/EyudWJ2/ZK2stff15//Jgg8bmmSGC4v8HVGhC g2dzsQ6vqEA/2MWWkw8Gy/m9vmAbpqg8hbMdOk/vuqGkE3i8s5sE2Cnb/z8SXA0isk15qNt Cjjmbb4oScnuTjfFj74fw== X-UI-Out-Filterresults: notjunk:1;V01:K0:8OtaTmDh2W8=:Y0JJz2WrLzAiwQfxiPLjED 3athBgKfQZnFxu0elG0M9KfRzKWhmxeIa+Z/YTOP+vCLNDS8dMd8DSnH+K65s6xenuDqYli4g tqvOh+thjgXzbzRtDu9RZMfMPsGMonpCRRR5qfo22M5X3vH6uI9zPET+RLi45AH+FTmJEAbtS 1yMOnr907T6eVZLUDxviIheTJxctitfI+buwnmWXWU7SuvmBunN2ilT7ZumukOO5akOXba2EP kblqulFejdLRAbZFiV6qyvmHbat2fBzgrsoJzMM3eFVjQo9IL2O4mqEUudVjNCJLBHdCSmvxu OuDDj9FcgRX5DxIoQhe3v5Xk/xjKSkOWZk9Hi8tGblKkDOop+mkRzjdSnPlvPcCXYVrT0C5JY hSWlQ56zkTjRBdUIzAHl3PXP69dOCu23vfi/RLim+VYHkGFmYFIzRK8yXyk2/SJ1dj8q/kKgF 04j5+YrSsXzSjNHwH2CSrim2cQ1toybygjfkTt5JSCMp3gEeabhMGswxjB6lt2WR6audNpzJs 7Ec25L2+5/q5F6/c+1msygs1BoVGYVffMfUvDiFrkOFg/N1SbJssAlqz/uAGyQohJFAeIXrqM G5nmTEd3+1dCLVSfmtxwWwQC/p3f27rwKyYLZeVuBYPeDFIhA2yR6z0/HdKH800eHaPchnYsP ieatdR8JN4K4UOWNd46DOWSN4rpeYcVA56EzcsTHaPqH6mYX8YPV6Qng2DjG5SS2xZFNUXLgj Ochb9kry62O/aIFptozbu1XIF73ZL59z/ltRaQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a preparation to allow using 'struct timespec64' in the asm/x86_init.h. Unfortunately, we can't use a forward declaration for timespec64 since it is defined as a macro on 64-bit architectures, and including linux/time64.h breaks compilation of arch/x86/boot/, which runs in realmode and can't use many of the regular kernel headers. As a workaround, I stop including asm/x86_init.h. This works fine for the realmode boot code since it does not require any of the x86_init.h contents, and setup.h doesn't either. However, a couple of other files that do need x86_init.h used to rely on it being included indirectly, so I have to put an explicit include in there now. Signed-off-by: Arnd Bergmann --- arch/x86/include/asm/setup.h | 1 - arch/x86/kernel/platform-quirks.c | 1 + arch/x86/platform/ce4100/ce4100.c | 1 + arch/x86/platform/intel-mid/intel-mid.c | 1 + arch/x86/platform/olpc/olpc.c | 1 + drivers/iommu/dmar.c | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index a65cf544686a..deed84119a22 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -27,7 +27,6 @@ #ifndef __ASSEMBLY__ #include -#include extern u64 relocated_ramdisk; diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c index 502a77d0adb0..d900c7b176f0 100644 --- a/arch/x86/kernel/platform-quirks.c +++ b/arch/x86/kernel/platform-quirks.c @@ -3,6 +3,7 @@ #include #include +#include void __init x86_early_init_platform_quirks(void) { diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c index ce4b06733c09..885196300927 100644 --- a/arch/x86/platform/ce4100/ce4100.c +++ b/arch/x86/platform/ce4100/ce4100.c @@ -22,6 +22,7 @@ #include #include #include +#include /* * The CE4100 platform has an internal 8051 Microcontroller which is diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c index 86676cec99a1..c6322263610a 100644 --- a/arch/x86/platform/intel-mid/intel-mid.c +++ b/arch/x86/platform/intel-mid/intel-mid.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "intel_mid_weak_decls.h" diff --git a/arch/x86/platform/olpc/olpc.c b/arch/x86/platform/olpc/olpc.c index 7c3077e58fa0..11a54f386911 100644 --- a/arch/x86/platform/olpc/olpc.c +++ b/arch/x86/platform/olpc/olpc.c @@ -26,6 +26,7 @@ #include #include #include +#include struct olpc_platform_t olpc_platform_info; EXPORT_SYMBOL_GPL(olpc_platform_info); diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 1ea7cd537873..e9304d6247e1 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "irq_remapping.h" -- 2.9.0