Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-02-12 23:46:54 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-12 23:46:54 -0800
commit9ae91ee6b582b448d6cb7c93793c763e98b731d8 (patch)
tree4232e96bac7cc1fd7fe0dd4a7676ff79325c2513
parentd8d3ff3d3d8b3a9a6d9a2307cc78c4948f3857c3 (diff)
[PATCH] Alpha: fix "extern inline" logic for core IO functions
From: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Again... This time due to pci.h->dmapool.h->io.h included in core logic files before __EXTERN_INLINE definition. To prevent such troubles in the future, make io.h/core_xx.h included before anything else. Also, this allows to get rid of some duplicated #include's.
-rw-r--r--arch/alpha/kernel/core_apecs.c12
-rw-r--r--arch/alpha/kernel/core_cia.c16
-rw-r--r--arch/alpha/kernel/core_irongate.c16
-rw-r--r--arch/alpha/kernel/core_lca.c12
-rw-r--r--arch/alpha/kernel/core_marvel.c8
-rw-r--r--arch/alpha/kernel/core_mcpcia.c13
-rw-r--r--arch/alpha/kernel/core_polaris.c12
-rw-r--r--arch/alpha/kernel/core_t2.c12
-rw-r--r--arch/alpha/kernel/core_titan.c17
-rw-r--r--arch/alpha/kernel/core_tsunami.c15
-rw-r--r--arch/alpha/kernel/core_wildfire.c12
11 files changed, 55 insertions, 90 deletions
diff --git a/arch/alpha/kernel/core_apecs.c b/arch/alpha/kernel/core_apecs.c
index 642153e74964..a27ba12ba35e 100644
--- a/arch/alpha/kernel/core_apecs.c
+++ b/arch/alpha/kernel/core_apecs.c
@@ -10,20 +10,18 @@
* Code common to all APECS core logic chips.
*/
-#include <linux/kernel.h>
+#define __EXTERN_INLINE inline
+#include <asm/io.h>
+#include <asm/core_apecs.h>
+#undef __EXTERN_INLINE
+
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/init.h>
-#include <asm/system.h>
#include <asm/ptrace.h>
#include <asm/smp.h>
-#define __EXTERN_INLINE inline
-#include <asm/io.h>
-#include <asm/core_apecs.h>
-#undef __EXTERN_INLINE
-
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c
index 459e209e9e40..7b3707ba6334 100644
--- a/arch/alpha/kernel/core_cia.c
+++ b/arch/alpha/kernel/core_cia.c
@@ -11,23 +11,19 @@
* Code common to all CIA core logic chips.
*/
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-
-#include <asm/system.h>
-#include <asm/ptrace.h>
-#include <asm/hwrpb.h>
-
#define __EXTERN_INLINE inline
#include <asm/io.h>
#include <asm/core_cia.h>
#undef __EXTERN_INLINE
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/sched.h>
+#include <linux/init.h>
#include <linux/bootmem.h>
+#include <asm/ptrace.h>
+
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c
index ee9c66254bc0..8659900724ca 100644
--- a/arch/alpha/kernel/core_irongate.c
+++ b/arch/alpha/kernel/core_irongate.c
@@ -9,27 +9,23 @@
* Code common to all IRONGATE core logic chips.
*/
-#include <linux/kernel.h>
+#define __EXTERN_INLINE inline
+#include <asm/io.h>
+#include <asm/core_irongate.h>
+#undef __EXTERN_INLINE
+
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/initrd.h>
+#include <linux/bootmem.h>
#include <asm/ptrace.h>
-#include <asm/system.h>
#include <asm/pci.h>
-#include <asm/hwrpb.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
-#define __EXTERN_INLINE inline
-#include <asm/io.h>
-#include <asm/core_irongate.h>
-#undef __EXTERN_INLINE
-
-#include <linux/bootmem.h>
-
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_lca.c b/arch/alpha/kernel/core_lca.c
index 41c05ba20ba6..6a5a9145c676 100644
--- a/arch/alpha/kernel/core_lca.c
+++ b/arch/alpha/kernel/core_lca.c
@@ -8,21 +8,19 @@
* Code common to all LCA core logic chips.
*/
-#include <linux/kernel.h>
+#define __EXTERN_INLINE inline
+#include <asm/io.h>
+#include <asm/core_lca.h>
+#undef __EXTERN_INLINE
+
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/tty.h>
#include <asm/ptrace.h>
-#include <asm/system.h>
#include <asm/smp.h>
-#define __EXTERN_INLINE inline
-#include <asm/io.h>
-#include <asm/core_lca.h>
-#undef __EXTERN_INLINE
-
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 469b3dc2ab78..5906f38fb7ff 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -4,14 +4,11 @@
* Code common to all Marvel based systems.
*/
-#include <linux/config.h>
-
#define __EXTERN_INLINE inline
#include <asm/io.h>
#include <asm/core_marvel.h>
#undef __EXTERN_INLINE
-#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/sched.h>
@@ -20,18 +17,15 @@
#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
#include <linux/module.h>
+#include <linux/bootmem.h>
#include <asm/ptrace.h>
-#include <asm/system.h>
#include <asm/smp.h>
-#include <asm/hwrpb.h>
#include <asm/gct.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/rtc.h>
-#include <linux/bootmem.h>
-
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_mcpcia.c b/arch/alpha/kernel/core_mcpcia.c
index 09505a3f1f57..28849c894153 100644
--- a/arch/alpha/kernel/core_mcpcia.c
+++ b/arch/alpha/kernel/core_mcpcia.c
@@ -6,7 +6,11 @@
* Code common to all MCbus-PCI Adaptor core logic chipsets
*/
-#include <linux/kernel.h>
+#define __EXTERN_INLINE inline
+#include <asm/io.h>
+#include <asm/core_mcpcia.h>
+#undef __EXTERN_INLINE
+
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/sched.h>
@@ -14,13 +18,6 @@
#include <linux/delay.h>
#include <asm/ptrace.h>
-#include <asm/system.h>
-#include <asm/hwrpb.h>
-
-#define __EXTERN_INLINE inline
-#include <asm/io.h>
-#include <asm/core_mcpcia.h>
-#undef __EXTERN_INLINE
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_polaris.c b/arch/alpha/kernel/core_polaris.c
index 604071eef3c8..277674a500ff 100644
--- a/arch/alpha/kernel/core_polaris.c
+++ b/arch/alpha/kernel/core_polaris.c
@@ -4,20 +4,18 @@
* POLARIS chip-specific code
*/
-#include <linux/kernel.h>
+#define __EXTERN_INLINE inline
+#include <asm/io.h>
+#include <asm/core_polaris.h>
+#undef __EXTERN_INLINE
+
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
-#include <asm/system.h>
#include <asm/ptrace.h>
-#define __EXTERN_INLINE inline
-#include <asm/io.h>
-#include <asm/core_polaris.h>
-#undef __EXTERN_INLINE
-
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c
index e028ecf0ad4b..ecce09e3626a 100644
--- a/arch/alpha/kernel/core_t2.c
+++ b/arch/alpha/kernel/core_t2.c
@@ -9,21 +9,19 @@
* Code common to all T2 core logic chips.
*/
-#include <linux/kernel.h>
+#define __EXTERN_INLINE
+#include <asm/io.h>
+#include <asm/core_t2.h>
+#undef __EXTERN_INLINE
+
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <asm/ptrace.h>
-#include <asm/system.h>
#include <asm/delay.h>
-#define __EXTERN_INLINE
-#include <asm/io.h>
-#include <asm/core_t2.h>
-#undef __EXTERN_INLINE
-
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c
index 1121327ed7e1..81e609a18070 100644
--- a/arch/alpha/kernel/core_titan.c
+++ b/arch/alpha/kernel/core_titan.c
@@ -4,29 +4,24 @@
* Code common to all TITAN core logic chips.
*/
-#include <linux/config.h>
+#define __EXTERN_INLINE inline
+#include <asm/io.h>
+#include <asm/core_titan.h>
+#undef __EXTERN_INLINE
+
#include <linux/module.h>
-#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/vmalloc.h>
+#include <linux/bootmem.h>
-#include <asm/hwrpb.h>
#include <asm/ptrace.h>
-#include <asm/system.h>
#include <asm/smp.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-#define __EXTERN_INLINE inline
-#include <asm/io.h>
-#include <asm/core_titan.h>
-#undef __EXTERN_INLINE
-
-#include <linux/bootmem.h>
-
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_tsunami.c b/arch/alpha/kernel/core_tsunami.c
index 21d2e6468fbe..215a8611bc28 100644
--- a/arch/alpha/kernel/core_tsunami.c
+++ b/arch/alpha/kernel/core_tsunami.c
@@ -6,23 +6,20 @@
* Code common to all TSUNAMI core logic chips.
*/
-#include <linux/kernel.h>
+#define __EXTERN_INLINE inline
+#include <asm/io.h>
+#include <asm/core_tsunami.h>
+#undef __EXTERN_INLINE
+
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
+#include <linux/bootmem.h>
#include <asm/ptrace.h>
-#include <asm/system.h>
#include <asm/smp.h>
-#define __EXTERN_INLINE inline
-#include <asm/io.h>
-#include <asm/core_tsunami.h>
-#undef __EXTERN_INLINE
-
-#include <linux/bootmem.h>
-
#include "proto.h"
#include "pci_impl.h"
diff --git a/arch/alpha/kernel/core_wildfire.c b/arch/alpha/kernel/core_wildfire.c
index aca89ad6f0c2..97f464b6326e 100644
--- a/arch/alpha/kernel/core_wildfire.c
+++ b/arch/alpha/kernel/core_wildfire.c
@@ -6,21 +6,19 @@
* Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
*/
-#include <linux/kernel.h>
+#define __EXTERN_INLINE inline
+#include <asm/io.h>
+#include <asm/core_wildfire.h>
+#undef __EXTERN_INLINE
+
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <asm/ptrace.h>
-#include <asm/system.h>
#include <asm/smp.h>
-#define __EXTERN_INLINE inline
-#include <asm/io.h>
-#include <asm/core_wildfire.h>
-#undef __EXTERN_INLINE
-
#include "proto.h"
#include "pci_impl.h"