[PATCH 8/15] ppc64: Move definition of xItLpQueue

[Michael Ellerman]

Hi,

The xItLpQueue is declared in LparData.c, move it into ItLpQueue.c

LparData.c is the only other file that needs to know about xItLpQueue, so
remove the extern definition from ItLpQueue.h and put it in LparData.c
directly.


Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
--
 arch/ppc64/kernel/ItLpQueue.c         |    8 ++++++++
 arch/ppc64/kernel/LparData.c          |    7 +------
 include/asm-ppc64/iSeries/ItLpQueue.h |    1 -
 3 files changed, 9 insertions(+), 7 deletions(-)

Index: work/arch/ppc64/kernel/ItLpQueue.c
===================================================================
--- work.orig/arch/ppc64/kernel/ItLpQueue.c
+++ work/arch/ppc64/kernel/ItLpQueue.c
@@ -20,6 +20,14 @@
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iSeries/HvCallEvent.h>
 
+/*
+ * The LpQueue is used to pass event data from the hypervisor to
+ * the partition.  This is where I/O interrupt events are communicated.
+ *
+ * It is written to by the hypervisor so cannot end up in the BSS.
+ */
+struct ItLpQueue xItLpQueue __attribute__((__section__(".data")));
+
 static char *event_types[9] = {
 	"Hypervisor\t\t",
 	"Machine Facilities\t",
Index: work/arch/ppc64/kernel/LparData.c
===================================================================
--- work.orig/arch/ppc64/kernel/LparData.c
+++ work/arch/ppc64/kernel/LparData.c
@@ -28,13 +28,8 @@
 #include <asm/iSeries/IoHriProcessorVpd.h>
 #include <asm/iSeries/ItSpCommArea.h>
 
-/* The LpQueue is used to pass event data from the hypervisor to
- * the partition.  This is where I/O interrupt events are communicated.
- */
-
-/* May be filled in by the hypervisor so cannot end up in the BSS */
-struct ItLpQueue xItLpQueue __attribute__((__section__(".data")));
 
+extern struct ItLpQueue xItLpQueue;
 
 /* The HvReleaseData is the root of the information shared between 
  * the hypervisor and Linux.  
Index: work/include/asm-ppc64/iSeries/ItLpQueue.h
===================================================================
--- work.orig/include/asm-ppc64/iSeries/ItLpQueue.h
+++ work/include/asm-ppc64/iSeries/ItLpQueue.h
@@ -74,7 +74,6 @@ struct ItLpQueue {
 	u64	xLpIntCountByType[9];	// 0x38-0x7F Event counts by type
 };
 
-extern struct ItLpQueue xItLpQueue;
 
 extern int ItLpQueue_isLpIntPending(void);
 extern unsigned ItLpQueue_process(struct pt_regs *);