[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157381100119.29467.13434467993345423920.tip-bot2@tip-bot2>
Date: Fri, 15 Nov 2019 09:43:21 -0000
From: "tip-bot2 for Christoph Hellwig" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Christoph Hellwig <hch@....de>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...nel.org>, Borislav Petkov <bp@...en8.de>,
linux-kernel@...r.kernel.org
Subject: [tip: x86/cleanups] x86/pci: Remove #ifdef __KERNEL__ guard from <asm/pci.h>
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: b52b0c4fc977901c243756e191f3fc686725b7d9
Gitweb: https://git.kernel.org/tip/b52b0c4fc977901c243756e191f3fc686725b7d9
Author: Christoph Hellwig <hch@....de>
AuthorDate: Wed, 13 Nov 2019 08:18:36 +01:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Fri, 15 Nov 2019 10:37:14 +01:00
x86/pci: Remove #ifdef __KERNEL__ guard from <asm/pci.h>
pci.h is not a UAPI header, so the __KERNEL__ ifdef is rather pointless.
Signed-off-by: Christoph Hellwig <hch@....de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Link: https://lkml.kernel.org/r/20191113071836.21041-4-hch@lst.de
---
arch/x86/include/asm/pci.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index d9e28aa..90d0731 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -12,8 +12,6 @@
#include <asm/pat.h>
#include <asm/x86_init.h>
-#ifdef __KERNEL__
-
struct pci_sysdata {
int domain; /* PCI domain */
int node; /* NUMA node */
@@ -118,7 +116,6 @@ void native_restore_msi_irqs(struct pci_dev *dev);
#define native_setup_msi_irqs NULL
#define native_teardown_msi_irq NULL
#endif
-#endif /* __KERNEL__ */
/* generic pci stuff */
#include <asm-generic/pci.h>
Powered by blists - more mailing lists