]> err.no Git - linux-2.6/commitdiff
ppc64 iseries: move some iSeries include files
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 28 Sep 2005 13:37:01 +0000 (23:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2005 08:03:56 +0000 (18:03 +1000)
These files are only referenced from within
arch/powerpc/platforms/iseries, so move them there.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
13 files changed:
arch/powerpc/platforms/iseries/call_sm.h [moved from include/asm-ppc64/iSeries/HvCallSm.h with 93% similarity]
arch/powerpc/platforms/iseries/ipl_parms.h [moved from include/asm-ppc64/iSeries/ItIplParmsReal.h with 96% similarity]
arch/powerpc/platforms/iseries/irq.c
arch/powerpc/platforms/iseries/irq.h [moved from include/asm-ppc64/iSeries/iSeries_irq.h with 64% similarity]
arch/powerpc/platforms/iseries/lpardata.c
arch/powerpc/platforms/iseries/main_store.h [moved from include/asm-ppc64/iSeries/IoHriMainStore.h with 97% similarity]
arch/powerpc/platforms/iseries/pci.c
arch/powerpc/platforms/iseries/proc.c
arch/powerpc/platforms/iseries/processor_vpd.h [moved from include/asm-ppc64/iSeries/IoHriProcessorVpd.h with 96% similarity]
arch/powerpc/platforms/iseries/release_data.h [moved from include/asm-ppc64/iSeries/HvReleaseData.h with 95% similarity]
arch/powerpc/platforms/iseries/setup.c
arch/powerpc/platforms/iseries/spcomm_area.h [moved from include/asm-ppc64/iSeries/ItSpCommArea.h with 93% similarity]
arch/powerpc/platforms/iseries/vpd_areas.h [moved from include/asm-ppc64/iSeries/ItVpdAreas.h with 97% similarity]

similarity index 93%
rename from include/asm-ppc64/iSeries/HvCallSm.h
rename to arch/powerpc/platforms/iseries/call_sm.h
index 8a3dbb071a4397962948c8ac0778a370c4d99b6f..ef223166cf22eb422104c8a7ecf11a4437de503b 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * HvCallSm.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-#ifndef _HVCALLSM_H
-#define _HVCALLSM_H
+#ifndef _ISERIES_CALL_SM_H
+#define _ISERIES_CALL_SM_H
 
 /*
  * This file contains the "hypervisor call" interface which is used to
@@ -35,4 +34,4 @@ static inline u64 HvCallSm_get64BitsOfAccessMap(HvLpIndex lpIndex,
        return HvCall2(HvCallSmGet64BitsOfAccessMap, lpIndex, indexIntoBitMap);
 }
 
-#endif /* _HVCALLSM_H */
+#endif /* _ISERIES_CALL_SM_H */
similarity index 96%
rename from include/asm-ppc64/iSeries/ItIplParmsReal.h
rename to arch/powerpc/platforms/iseries/ipl_parms.h
index ae3417dc599e571da52621fceac99e904fc4b616..77c135ddbf1b8e5135c66735a28734205a69b15c 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * ItIplParmsReal.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-#ifndef _ITIPLPARMSREAL_H
-#define _ITIPLPARMSREAL_H
+#ifndef _ISERIES_IPL_PARMS_H
+#define _ISERIES_IPL_PARMS_H
 
 /*
  *     This struct maps the IPL Parameters DMA'd from the SP.
@@ -68,4 +67,4 @@ struct ItIplParmsReal {
 
 extern struct ItIplParmsReal   xItIplParmsReal;
 
-#endif /* _ITIPLPARMSREAL_H */
+#endif /* _ISERIES_IPL_PARMS_H */
index 5a8a0056b31f15ba693cd8b5bdfb081e657ccc00..31fb5fa67fa36ae81700e10b86aa5e3c276b562b 100644 (file)
@@ -40,7 +40,8 @@
 #include <asm/iSeries/HvLpEvent.h>
 #include <asm/iSeries/HvCallPci.h>
 #include <asm/iSeries/HvCallXm.h>
-#include <asm/iSeries/iSeries_irq.h>
+
+#include "irq.h"
 
 /* This maps virtual irq numbers to real irqs */
 unsigned int virt_irq_to_real_map[NR_IRQS];
similarity index 64%
rename from include/asm-ppc64/iSeries/iSeries_irq.h
rename to arch/powerpc/platforms/iseries/irq.h
index 6c9767ac1302a84c38ae8dd84679dbfb0923c233..5f643f16ecc0eea1a9b6149a9a029863b5f14b61 100644 (file)
@@ -1,8 +1,8 @@
-#ifndef        __ISERIES_IRQ_H__
-#define        __ISERIES_IRQ_H__
+#ifndef        _ISERIES_IRQ_H
+#define        _ISERIES_IRQ_H
 
 extern void iSeries_init_IRQ(void);
 extern int  iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, HvAgentId);
 extern void iSeries_activate_IRQs(void);
 
-#endif /* __ISERIES_IRQ_H__ */
+#endif /* _ISERIES_IRQ_H */
index 87b7ad8ca4650189fda1bfeff53703dc1d8e93a5..ed2ffee6f731ccd2271bd1f3fea26ebe7238487d 100644 (file)
 #include <asm/lppaca.h>
 #include <asm/iSeries/ItLpRegSave.h>
 #include <asm/paca.h>
-#include <asm/iSeries/HvReleaseData.h>
 #include <asm/iSeries/LparMap.h>
-#include <asm/iSeries/ItVpdAreas.h>
-#include <asm/iSeries/ItIplParmsReal.h>
 #include <asm/iSeries/ItExtVpdPanel.h>
 #include <asm/iSeries/ItLpQueue.h>
-#include <asm/iSeries/IoHriProcessorVpd.h>
-#include <asm/iSeries/ItSpCommArea.h>
 
+#include "vpd_areas.h"
+#include "spcomm_area.h"
+#include "ipl_parms.h"
+#include "processor_vpd.h"
+#include "release_data.h"
 
 /* The HvReleaseData is the root of the information shared between
  * the hypervisor and Linux.
similarity index 97%
rename from include/asm-ppc64/iSeries/IoHriMainStore.h
rename to arch/powerpc/platforms/iseries/main_store.h
index 45ed3ea67d060facbad6575a9327df80a3cfac1d..74f6889f834f1679f09ccd8bbc772fdafd6aade2 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * IoHriMainStore.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#ifndef _IOHRIMAINSTORE_H
-#define _IOHRIMAINSTORE_H
+#ifndef _ISERIES_MAIN_STORE_H
+#define _ISERIES_MAIN_STORE_H
 
 /* Main Store Vpd for Condor,iStar,sStar */
 struct IoHriMainStoreSegment4 {
@@ -163,4 +162,4 @@ struct IoHriMainStoreSegment5 {
 
 extern u64     xMsVpd[];
 
-#endif /* _IOHRIMAINSTORE_H */
+#endif /* _ISERIES_MAIN_STORE_H */
index 501b1dcbfac51b589acf3b554f467fd4b7b6a4b2..70185dec940b4baef1b06c84b48797f0ac3e2ed4 100644 (file)
 
 #include <asm/iSeries/HvCallPci.h>
 #include <asm/iSeries/HvCallXm.h>
-#include <asm/iSeries/iSeries_irq.h>
 #include <asm/iSeries/iSeries_pci.h>
 #include <asm/iSeries/mf.h>
 
 #include <asm/ppc-pci.h>
 
+#include "irq.h"
+
 extern unsigned long io_page_mask;
 
 /*
index d46b473ce4ddad87cea24f9083b0a3ea44865e52..6f1929cac66befabf0e14930c05b1072ec78c461 100644 (file)
@@ -26,8 +26,9 @@
 #include <asm/lppaca.h>
 #include <asm/iSeries/ItLpQueue.h>
 #include <asm/iSeries/HvCallXm.h>
-#include <asm/iSeries/IoHriMainStore.h>
-#include <asm/iSeries/IoHriProcessorVpd.h>
+
+#include "processor_vpd.h"
+#include "main_store.h"
 
 static int __init iseries_proc_create(void)
 {
similarity index 96%
rename from include/asm-ppc64/iSeries/IoHriProcessorVpd.h
rename to arch/powerpc/platforms/iseries/processor_vpd.h
index 73b73d80b8b11fb980108ae757fc5771a645f1fd..7ac5d0d0dbfade985bf9ba70fcc4201183e9edcc 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * IoHriProcessorVpd.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-#ifndef _IOHRIPROCESSORVPD_H
-#define _IOHRIPROCESSORVPD_H
+#ifndef _ISERIES_PROCESSOR_VPD_H
+#define _ISERIES_PROCESSOR_VPD_H
 
 #include <asm/types.h>
 
@@ -83,4 +82,4 @@ struct IoHriProcessorVpd {
 
 extern struct IoHriProcessorVpd        xIoHriProcessorVpd[];
 
-#endif /* _IOHRIPROCESSORVPD_H */
+#endif /* _ISERIES_PROCESSOR_VPD_H */
similarity index 95%
rename from include/asm-ppc64/iSeries/HvReleaseData.h
rename to arch/powerpc/platforms/iseries/release_data.h
index c8162e5ccb210fff3d288c9f92915251bb868669..c68b9c3e5caf4d35ccfc1c57e1cb9ddfce83556f 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * HvReleaseData.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-#ifndef _HVRELEASEDATA_H
-#define _HVRELEASEDATA_H
+#ifndef _ISERIES_RELEASE_DATA_H
+#define _ISERIES_RELEASE_DATA_H
 
 /*
  * This control block contains the critical information about the
@@ -61,4 +60,4 @@ struct HvReleaseData {
 
 extern struct HvReleaseData    hvReleaseData;
 
-#endif /* _HVRELEASEDATA_H */
+#endif /* _ISERIES_RELEASE_DATA_H */
index ad78c8581a5ab512a11c9f2247bf69558b54447d..c3e532b766ef3b84f126babbb36672abba52d092 100644 (file)
 #include <asm/iSeries/HvCallHpt.h>
 #include <asm/iSeries/HvLpConfig.h>
 #include <asm/iSeries/HvCallEvent.h>
-#include <asm/iSeries/HvCallSm.h>
 #include <asm/iSeries/HvCallXm.h>
 #include <asm/iSeries/ItLpQueue.h>
-#include <asm/iSeries/IoHriMainStore.h>
 #include <asm/iSeries/mf.h>
 #include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/iSeries_irq.h>
-#include <asm/iSeries/IoHriProcessorVpd.h>
-#include <asm/iSeries/ItVpdAreas.h>
 #include <asm/iSeries/LparMap.h>
 
 #include "setup.h"
+#include "irq.h"
+#include "vpd_areas.h"
+#include "processor_vpd.h"
+#include "main_store.h"
+#include "call_sm.h"
 
 extern void hvlog(char *fmt, ...);
 
similarity index 93%
rename from include/asm-ppc64/iSeries/ItSpCommArea.h
rename to arch/powerpc/platforms/iseries/spcomm_area.h
index 5535f8271c9f0bc139876014f6577b21ee53a793..6e3b685115c99fb6301cf1c17a269152a1d04485 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * ItSpCommArea.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#ifndef _ITSPCOMMAREA_H
-#define _ITSPCOMMAREA_H
+#ifndef _ISERIES_SPCOMM_AREA_H
+#define _ISERIES_SPCOMM_AREA_H
 
 
 struct SpCommArea {
@@ -34,4 +33,4 @@ struct SpCommArea {
 
 extern struct SpCommArea xSpCommArea;
 
-#endif /* _ITSPCOMMAREA_H */
+#endif /* _ISERIES_SPCOMM_AREA_H */
similarity index 97%
rename from include/asm-ppc64/iSeries/ItVpdAreas.h
rename to arch/powerpc/platforms/iseries/vpd_areas.h
index 71b3ad24f95a6e4b0f0469ffc443140310446e2e..601e6dd860ed340a33fe298a024be1b5b89061dc 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * ItVpdAreas.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-#ifndef _ITVPDAREAS_H
-#define _ITVPDAREAS_H
+#ifndef _ISERIES_VPD_AREAS_H
+#define _ISERIES_VPD_AREAS_H
 
 /*
  * This file defines the address and length of all of the VPD area passed to
@@ -86,4 +85,4 @@ struct ItVpdAreas {
 
 extern struct ItVpdAreas       itVpdAreas;
 
-#endif /* _ITVPDAREAS_H */
+#endif /* _ISERIES_VPD_AREAS_H */