merge filename and modify references to iseries/hv_types.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>

diff --git a/arch/powerpc/platforms/iseries/call_hpt.h b/arch/powerpc/platforms/iseries/call_hpt.h
index a626d8c289ee82154618d8cd4969dd16f1d72377..a843b0f87b72c10c53a2dd775d318e319d1862c4 100644 (file)
--- a/arch/powerpc/platforms/iseries/call_hpt.h
+++ b/arch/powerpc/platforms/iseries/call_hpt.h
@@ -24,7 +24,7 @@
  */
 
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/mmu.h>
 
 #define HvCallHptGetHptAddress         HvCallHpt +  0

diff --git a/arch/powerpc/platforms/iseries/call_pci.h b/arch/powerpc/platforms/iseries/call_pci.h
index 53cc163d468922d8a2cd8b183d09b8f656175996..59d4e0ad5cf324796e5ea7e7dd081feef071f476 100644 (file)
--- a/arch/powerpc/platforms/iseries/call_pci.h
+++ b/arch/powerpc/platforms/iseries/call_pci.h
@@ -26,7 +26,7 @@
 #define _PLATFORMS_ISERIES_CALL_PCI_H
 
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 
 /*
  * DSA == Direct Select Address

diff --git a/arch/powerpc/platforms/iseries/call_sm.h b/arch/powerpc/platforms/iseries/call_sm.h
index a9726822e95324f1ab426b5c3f9c9be3c8cdb1a9..c7e251619f48f34376688f9d2320c20fad73c5ad 100644 (file)
--- a/arch/powerpc/platforms/iseries/call_sm.h
+++ b/arch/powerpc/platforms/iseries/call_sm.h
@@ -24,7 +24,7 @@
  */
 
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 
 #define HvCallSmGet64BitsOfAccessMap   HvCallSm  + 11
 

diff --git a/arch/powerpc/platforms/iseries/hvlog.c b/arch/powerpc/platforms/iseries/hvlog.c
index 48a3f7900389eb5593ebd782d1117bef4967d4b0..62ec73479687ee6b4b2a2f677e3fa7b96b924156 100644 (file)
--- a/arch/powerpc/platforms/iseries/hvlog.c
+++ b/arch/powerpc/platforms/iseries/hvlog.c
@@ -11,7 +11,7 @@
 #include <asm/abs_addr.h>
 #include <asm/iseries/hv_call.h>
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 
 
 void HvCall_writeLogBuffer(const void *buffer, u64 len)

diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 55ecc8d3e73fb956df4f78502db27e1ab028a81f..c1135912cc055c2df6139a64ebe346a67349c94b 100644 (file)
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -36,7 +36,7 @@
 #include <linux/spinlock.h>
 
 #include <asm/ppcdebug.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_xm.h>
 

diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index 4e2dafc83bb2575b875678591bd4e369d4f53346..d607ebaef270a8496c561dc5721b3628adea71d0 100644 (file)
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -18,7 +18,7 @@
 #include <asm/abs_addr.h>
 #include <asm/page.h>
 #include <asm/iSeries/vio.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call_xm.h>
 

diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 7b1a9daae206bf2a04152a0031d4bd0c54755610..17bf4e70d5cc491ceed59d3842fd864e2193fc1a 100644 (file)
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -41,7 +41,7 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iSeries/ItExtVpdPanel.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>

diff --git a/arch/powerpc/platforms/iseries/vpdinfo.c b/arch/powerpc/platforms/iseries/vpdinfo.c
index 9c318849dee7a163218ba00bff9dd9ad7ba11c23..23a6d1e5b4293236fd414d046bae8ecb9c843681 100644 (file)
--- a/arch/powerpc/platforms/iseries/vpdinfo.c
+++ b/arch/powerpc/platforms/iseries/vpdinfo.c
@@ -32,7 +32,7 @@
 #include <asm/resource.h>
 #include <asm/abs_addr.h>
 #include <asm/pci-bridge.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 
 #include "pci.h"
 #include "call_pci.h"

diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 3af1885a8200fe650330cd1f8b46dab1b84b85b3..436f169baf02604bbe75180e23802160dd4b3166 100644 (file)
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -45,7 +45,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/vio.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iSeries/vio.h>

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index da78729413f46f85d8dc40ffa24fc2cac01bb79b..cb87d270b6bb9df5771a36fb1aebfe554e54c3b4 100644 (file)
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -46,7 +46,7 @@
 
 #include <asm/vio.h>
 #include <asm/scatterlist.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iSeries/vio.h>
 

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 57ba1a11e405326f4086bb281052ec769b214023..1070140d9f5968dd8a57fce541c7df099ec63ef7 100644 (file)
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -76,7 +76,7 @@
 #include <asm/uaccess.h>
 
 #include <asm/iseries/hv_lp_config.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iommu.h>
 #include <asm/vio.h>

diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index 78397d855d34eabcd0855c9a3704ce4ba8ab2dfd..ed89659ac3bf896b575726d0deff8854434242da 100644 (file)
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -30,7 +30,7 @@
 
 #include <asm/iSeries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/vio.h>
 #include <linux/device.h>

diff --git a/include/asm-powerpc/iseries/hv_call.h b/include/asm-powerpc/iseries/hv_call.h
index 5edfe2c8ea333eeef50a7b7e8f97072892a74996..af59cc1e969165338f82bedd4411d268e9b6c1e0 100644 (file)
--- a/include/asm-powerpc/iseries/hv_call.h
+++ b/include/asm-powerpc/iseries/hv_call.h
@@ -24,7 +24,7 @@
 #define _HVCALL_H
 
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/paca.h>
 
 /* Type of yield for HvCallBaseYieldProcessor */

diff --git a/include/asm-powerpc/iseries/hv_call_event.h b/include/asm-powerpc/iseries/hv_call_event.h
index 202c87c39ef49a61560f3f2b956893bc4ace0dd9..c2770b056ae89be905433e1e02597c7fb52be51b 100644 (file)
--- a/include/asm-powerpc/iseries/hv_call_event.h
+++ b/include/asm-powerpc/iseries/hv_call_event.h
@@ -24,7 +24,7 @@
 #define _HVCALLEVENT_H
 
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/abs_addr.h>
 
 struct HvLpEvent;

diff --git a/include/asm-powerpc/iseries/hv_call_xm.h b/include/asm-powerpc/iseries/hv_call_xm.h
index 8a7b6e3c01ac926ab90cbd73ecd2099b42757b15..fd36b11612f885c28fdcc23ab2fe17f26fc78838 100644 (file)
--- a/include/asm-powerpc/iseries/hv_call_xm.h
+++ b/include/asm-powerpc/iseries/hv_call_xm.h
@@ -6,7 +6,7 @@
 #define _HVCALLXM_H
 
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 
 #define HvCallXmGetTceTableParms       HvCallXm +  0
 #define HvCallXmTestBus                        HvCallXm +  1

diff --git a/include/asm-powerpc/iseries/hv_lp_config.h b/include/asm-powerpc/iseries/hv_lp_config.h
index 9077fc8e3f6c48cef50f1b70c8130c580ce26844..600795bbc8905a1c733aae2b5194da82d54ce69f 100644 (file)
--- a/include/asm-powerpc/iseries/hv_lp_config.h
+++ b/include/asm-powerpc/iseries/hv_lp_config.h
@@ -25,7 +25,7 @@
  */
 
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iSeries/ItLpNaca.h>
 
 enum {

diff --git a/include/asm-powerpc/iseries/hv_lp_event.h b/include/asm-powerpc/iseries/hv_lp_event.h
index 75ff1b3ed2e5647413a84a47c8c242b2db70ae9b..2a3b773854b1b4a6accd1b73d88c2bbbe59a8aa4 100644 (file)
--- a/include/asm-powerpc/iseries/hv_lp_event.h
+++ b/include/asm-powerpc/iseries/hv_lp_event.h
@@ -24,7 +24,7 @@
 
 #include <asm/types.h>
 #include <asm/ptrace.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_call_event.h>
 
 /*

diff --git a/include/asm-powerpc/iseries/hv_types.h b/include/asm-powerpc/iseries/hv_types.h
new file mode 100644 (file)
index 0000000..b1ef2b4
--- /dev/null
+++ b/include/asm-powerpc/iseries/hv_types.h
@@ -0,0 +1,113 @@
+/*
+ * HvTypes.h
+ * Copyright (C) 2001  Mike Corrigan IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#ifndef _HVTYPES_H
+#define _HVTYPES_H
+
+/*
+ * General typedefs for the hypervisor.
+ */
+
+#include <asm/types.h>
+
+typedef u8     HvLpIndex;
+typedef u16    HvLpInstanceId;
+typedef u64    HvLpTOD;
+typedef u64    HvLpSystemSerialNum;
+typedef u8     HvLpDeviceSerialNum[12];
+typedef u16    HvLpSanHwSet;
+typedef u16    HvLpBus;
+typedef u16    HvLpBoard;
+typedef u16    HvLpCard;
+typedef u8     HvLpDeviceType[4];
+typedef u8     HvLpDeviceModel[3];
+typedef u64    HvIoToken;
+typedef u8     HvLpName[8];
+typedef u32    HvIoId;
+typedef u64    HvRealMemoryIndex;
+typedef u32    HvLpIndexMap;   /* Must hold HVMAXARCHITECTEDLPS bits!!! */
+typedef u16    HvLpVrmIndex;
+typedef u32    HvXmGenerationId;
+typedef u8     HvLpBusPool;
+typedef u8     HvLpSharedPoolIndex;
+typedef u16    HvLpSharedProcUnitsX100;
+typedef u8     HvLpVirtualLanIndex;
+typedef u16    HvLpVirtualLanIndexMap; /* Must hold HVMAXARCHITECTEDVIRTUALLANS bits!!! */
+typedef u16    HvBusNumber;    /* Hypervisor Bus Number */
+typedef u8     HvSubBusNumber; /* Hypervisor SubBus Number */
+typedef u8     HvAgentId;      /* Hypervisor DevFn */
+
+
+#define HVMAXARCHITECTEDLPS            32
+#define HVMAXARCHITECTEDVIRTUALLANS    16
+#define HVMAXARCHITECTEDVIRTUALDISKS   32
+#define HVMAXARCHITECTEDVIRTUALCDROMS  8
+#define HVMAXARCHITECTEDVIRTUALTAPES   8
+#define HVCHUNKSIZE                    (256 * 1024)
+#define HVPAGESIZE                     (4 * 1024)
+#define HVLPMINMEGSPRIMARY             256
+#define HVLPMINMEGSSECONDARY           64
+#define HVCHUNKSPERMEG                 4
+#define HVPAGESPERMEG                  256
+#define HVPAGESPERCHUNK                        64
+
+#define HvLpIndexInvalid               ((HvLpIndex)0xff)
+
+/*
+ * Enums for the sub-components under PLIC
+ * Used in HvCall  and HvPrimaryCall
+ */
+enum {
+       HvCallCompId = 0,
+       HvCallCpuCtlsCompId = 1,
+       HvCallCfgCompId = 2,
+       HvCallEventCompId = 3,
+       HvCallHptCompId = 4,
+       HvCallPciCompId = 5,
+       HvCallSlmCompId = 6,
+       HvCallSmCompId = 7,
+       HvCallSpdCompId = 8,
+       HvCallXmCompId = 9,
+       HvCallRioCompId = 10,
+       HvCallRsvd3CompId = 11,
+       HvCallRsvd2CompId = 12,
+       HvCallRsvd1CompId = 13,
+       HvCallMaxCompId = 14,
+       HvPrimaryCallCompId = 0,
+       HvPrimaryCallCfgCompId = 1,
+       HvPrimaryCallPciCompId = 2,
+       HvPrimaryCallSmCompId = 3,
+       HvPrimaryCallSpdCompId = 4,
+       HvPrimaryCallXmCompId = 5,
+       HvPrimaryCallRioCompId = 6,
+       HvPrimaryCallRsvd7CompId = 7,
+       HvPrimaryCallRsvd6CompId = 8,
+       HvPrimaryCallRsvd5CompId = 9,
+       HvPrimaryCallRsvd4CompId = 10,
+       HvPrimaryCallRsvd3CompId = 11,
+       HvPrimaryCallRsvd2CompId = 12,
+       HvPrimaryCallRsvd1CompId = 13,
+       HvPrimaryCallMaxCompId = HvCallMaxCompId
+};
+
+struct HvLpBufferList {
+       u64 addr;
+       u64 len;
+};
+
+#endif /* _HVTYPES_H */

diff --git a/include/asm-ppc64/iSeries/HvTypes.h b/include/asm-ppc64/iSeries/HvTypes.h
deleted file mode 100644 (file)
index b1ef2b4..0000000
--- a/include/asm-ppc64/iSeries/HvTypes.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * HvTypes.h
- * Copyright (C) 2001  Mike Corrigan IBM Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#ifndef _HVTYPES_H
-#define _HVTYPES_H
-
-/*
- * General typedefs for the hypervisor.
- */
-
-#include <asm/types.h>
-
-typedef u8     HvLpIndex;
-typedef u16    HvLpInstanceId;
-typedef u64    HvLpTOD;
-typedef u64    HvLpSystemSerialNum;
-typedef u8     HvLpDeviceSerialNum[12];
-typedef u16    HvLpSanHwSet;
-typedef u16    HvLpBus;
-typedef u16    HvLpBoard;
-typedef u16    HvLpCard;
-typedef u8     HvLpDeviceType[4];
-typedef u8     HvLpDeviceModel[3];
-typedef u64    HvIoToken;
-typedef u8     HvLpName[8];
-typedef u32    HvIoId;
-typedef u64    HvRealMemoryIndex;
-typedef u32    HvLpIndexMap;   /* Must hold HVMAXARCHITECTEDLPS bits!!! */
-typedef u16    HvLpVrmIndex;
-typedef u32    HvXmGenerationId;
-typedef u8     HvLpBusPool;
-typedef u8     HvLpSharedPoolIndex;
-typedef u16    HvLpSharedProcUnitsX100;
-typedef u8     HvLpVirtualLanIndex;
-typedef u16    HvLpVirtualLanIndexMap; /* Must hold HVMAXARCHITECTEDVIRTUALLANS bits!!! */
-typedef u16    HvBusNumber;    /* Hypervisor Bus Number */
-typedef u8     HvSubBusNumber; /* Hypervisor SubBus Number */
-typedef u8     HvAgentId;      /* Hypervisor DevFn */
-
-
-#define HVMAXARCHITECTEDLPS            32
-#define HVMAXARCHITECTEDVIRTUALLANS    16
-#define HVMAXARCHITECTEDVIRTUALDISKS   32
-#define HVMAXARCHITECTEDVIRTUALCDROMS  8
-#define HVMAXARCHITECTEDVIRTUALTAPES   8
-#define HVCHUNKSIZE                    (256 * 1024)
-#define HVPAGESIZE                     (4 * 1024)
-#define HVLPMINMEGSPRIMARY             256
-#define HVLPMINMEGSSECONDARY           64
-#define HVCHUNKSPERMEG                 4
-#define HVPAGESPERMEG                  256
-#define HVPAGESPERCHUNK                        64
-
-#define HvLpIndexInvalid               ((HvLpIndex)0xff)
-
-/*
- * Enums for the sub-components under PLIC
- * Used in HvCall  and HvPrimaryCall
- */
-enum {
-       HvCallCompId = 0,
-       HvCallCpuCtlsCompId = 1,
-       HvCallCfgCompId = 2,
-       HvCallEventCompId = 3,
-       HvCallHptCompId = 4,
-       HvCallPciCompId = 5,
-       HvCallSlmCompId = 6,
-       HvCallSmCompId = 7,
-       HvCallSpdCompId = 8,
-       HvCallXmCompId = 9,
-       HvCallRioCompId = 10,
-       HvCallRsvd3CompId = 11,
-       HvCallRsvd2CompId = 12,
-       HvCallRsvd1CompId = 13,
-       HvCallMaxCompId = 14,
-       HvPrimaryCallCompId = 0,
-       HvPrimaryCallCfgCompId = 1,
-       HvPrimaryCallPciCompId = 2,
-       HvPrimaryCallSmCompId = 3,
-       HvPrimaryCallSpdCompId = 4,
-       HvPrimaryCallXmCompId = 5,
-       HvPrimaryCallRioCompId = 6,
-       HvPrimaryCallRsvd7CompId = 7,
-       HvPrimaryCallRsvd6CompId = 8,
-       HvPrimaryCallRsvd5CompId = 9,
-       HvPrimaryCallRsvd4CompId = 10,
-       HvPrimaryCallRsvd3CompId = 11,
-       HvPrimaryCallRsvd2CompId = 12,
-       HvPrimaryCallRsvd1CompId = 13,
-       HvPrimaryCallMaxCompId = HvCallMaxCompId
-};
-
-struct HvLpBufferList {
-       u64 addr;
-       u64 len;
-};
-
-#endif /* _HVTYPES_H */

diff --git a/include/asm-ppc64/iSeries/mf.h b/include/asm-ppc64/iSeries/mf.h
index f84404a07f4b35b60c5fad734a807c0a559af96b..166cd73f5c15545c732cc24b80fcd58bbaee0bc5 100644 (file)
--- a/include/asm-ppc64/iSeries/mf.h
+++ b/include/asm-ppc64/iSeries/mf.h
@@ -28,7 +28,7 @@
 
 #include <linux/types.h>
 
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iSeries/iseries/hv_call_event.h>
 
 struct rtc_time;

diff --git a/include/asm-ppc64/iSeries/vio.h b/include/asm-ppc64/iSeries/vio.h
index 4d39ce6c687a50ff5c0c1cc4b38e9cdb2c5069ac..2b57dbf5c257d96c8a4f4a5ab3f30ae12764c2cf 100644 (file)
--- a/include/asm-ppc64/iSeries/vio.h
+++ b/include/asm-ppc64/iSeries/vio.h
@@ -41,7 +41,7 @@
 #ifndef _ISERIES_VIO_H
 #define _ISERIES_VIO_H
 
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 
 /*