merge filename and modify references to iseries/it_lp_naca.h

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

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 40c48100bf1b433c00b4d41b390bae763d1ab69d..079867e181455930d2dacd3620111f380bc03293 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -56,7 +56,7 @@
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/lmb.h>
-#include <asm/iSeries/ItLpNaca.h>
+#include <asm/iseries/it_lp_naca.h>
 #include <asm/firmware.h>
 #include <asm/systemcfg.h>
 #include <asm/xmon.h>

diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
index 9c8c212521428d97132af9c0bed1823749f1aa68..d0937613e776fe166ab6d2f296315ce415c58033 100644 (file)
--- a/arch/powerpc/platforms/iseries/lpardata.c
+++ b/arch/powerpc/platforms/iseries/lpardata.c
@@ -15,7 +15,7 @@
 #include <asm/ptrace.h>
 #include <asm/naca.h>
 #include <asm/abs_addr.h>
-#include <asm/iSeries/ItLpNaca.h>
+#include <asm/iseries/it_lp_naca.h>
 #include <asm/lppaca.h>
 #include <asm/iSeries/ItLpRegSave.h>
 #include <asm/paca.h>

diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index 39ee881c36c3f9507660d21a132ef7e11cad7ed8..f0040d469a49ad9a42d3f7e1e720f4c602b618b1 100644 (file)
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -20,7 +20,7 @@
 #include <asm/iSeries/ItLpQueue.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
-#include <asm/iSeries/ItLpNaca.h>
+#include <asm/iseries/it_lp_naca.h>
 
 /*
  * The LpQueue is used to pass event data from the hypervisor to

diff --git a/include/asm-powerpc/iseries/hv_lp_config.h b/include/asm-powerpc/iseries/hv_lp_config.h
index 600795bbc8905a1c733aae2b5194da82d54ce69f..db577f079f253a8d936f3c4efc9052ec039c4619 100644 (file)
--- a/include/asm-powerpc/iseries/hv_lp_config.h
+++ b/include/asm-powerpc/iseries/hv_lp_config.h
@@ -26,7 +26,7 @@
 
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>
-#include <asm/iSeries/ItLpNaca.h>
+#include <asm/iseries/it_lp_naca.h>
 
 enum {
        HvCallCfg_Cur   = 0,

diff --git a/include/asm-powerpc/iseries/it_lp_naca.h b/include/asm-powerpc/iseries/it_lp_naca.h
new file mode 100644 (file)
index 0000000..225d017
--- /dev/null
+++ b/include/asm-powerpc/iseries/it_lp_naca.h
@@ -0,0 +1,80 @@
+/*
+ * ItLpNaca.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 _ITLPNACA_H
+#define _ITLPNACA_H
+
+#include <linux/types.h>
+
+/*
+ *     This control block contains the data that is shared between the
+ *     hypervisor (PLIC) and the OS.
+ */
+
+struct ItLpNaca {
+// CACHE_LINE_1 0x0000 - 0x007F Contains read-only data
+       u32     xDesc;                  // Eye catcher                  x00-x03
+       u16     xSize;                  // Size of this class           x04-x05
+       u16     xIntHdlrOffset;         // Offset to IntHdlr array      x06-x07
+       u8      xMaxIntHdlrEntries;     // Number of entries in array   x08-x08
+       u8      xPrimaryLpIndex;        // LP Index of Primary          x09-x09
+       u8      xServiceLpIndex;        // LP Ind of Service Focal Pointx0A-x0A
+       u8      xLpIndex;               // LP Index                     x0B-x0B
+       u16     xMaxLpQueues;           // Number of allocated queues   x0C-x0D
+       u16     xLpQueueOffset;         // Offset to start of LP queues x0E-x0F
+       u8      xPirEnvironMode:8;      // Piranha or hardware          x10-x10
+       u8      xPirConsoleMode:8;      // Piranha console indicator    x11-x11
+       u8      xPirDasdMode:8;         // Piranha dasd indicator       x12-x12
+       u8      xRsvd1_0[5];            // Reserved for Piranha related x13-x17
+       u8      xLparInstalled:1;       // Is LPAR installed on system  x18-x1F
+       u8      xSysPartitioned:1;      // Is the system partitioned    ...
+       u8      xHwSyncedTBs:1;         // Hardware synced TBs          ...
+       u8      xIntProcUtilHmt:1;      // Utilize HMT for interrupts   ...
+       u8      xRsvd1_1:4;             // Reserved                     ...
+       u8      xSpVpdFormat:8;         // VPD areas are in CSP format  ...
+       u8      xIntProcRatio:8;        // Ratio of int procs to procs  ...
+       u8      xRsvd1_2[5];            // Reserved                     ...
+       u16     xRsvd1_3;               // Reserved                     x20-x21
+       u16     xPlicVrmIndex;          // VRM index of PLIC            x22-x23
+       u16     xMinSupportedSlicVrmInd;// Min supported OS VRM index   x24-x25
+       u16     xMinCompatableSlicVrmInd;// Min compatible OS VRM index x26-x27
+       u64     xLoadAreaAddr;          // ER address of load area      x28-x2F
+       u32     xLoadAreaChunks;        // Chunks for the load area     x30-x33
+       u32     xPaseSysCallCRMask;     // Mask used to test CR before  x34-x37
+                                       // doing an ASR switch on PASE
+                                       // system call.
+       u64     xSlicSegmentTablePtr;   // Pointer to Slic seg table.   x38-x3f
+       u8      xRsvd1_4[64];           //                              x40-x7F
+
+// CACHE_LINE_2 0x0080 - 0x00FF Contains local read-write data
+       u8      xRsvd2_0[128];          // Reserved                     x00-x7F
+
+// CACHE_LINE_3-6 0x0100 - 0x02FF Contains LP Queue indicators
+// NB: Padding required to keep xInterrruptHdlr at x300 which is required
+// for v4r4 PLIC.
+       u8      xOldLpQueue[128];       // LP Queue needed for v4r4     100-17F
+       u8      xRsvd3_0[384];          // Reserved                     180-2FF
+
+// CACHE_LINE_7-8 0x0300 - 0x03FF Contains the address of the OS interrupt
+//  handlers
+       u64     xInterruptHdlr[32];     // Interrupt handlers           300-x3FF
+};
+
+extern struct ItLpNaca         itLpNaca;
+
+#endif /* _ITLPNACA_H */

diff --git a/include/asm-ppc64/iSeries/ItLpNaca.h b/include/asm-ppc64/iSeries/ItLpNaca.h
deleted file mode 100644 (file)
index 225d017..0000000
--- a/include/asm-ppc64/iSeries/ItLpNaca.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * ItLpNaca.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 _ITLPNACA_H
-#define _ITLPNACA_H
-
-#include <linux/types.h>
-
-/*
- *     This control block contains the data that is shared between the
- *     hypervisor (PLIC) and the OS.
- */
-
-struct ItLpNaca {
-// CACHE_LINE_1 0x0000 - 0x007F Contains read-only data
-       u32     xDesc;                  // Eye catcher                  x00-x03
-       u16     xSize;                  // Size of this class           x04-x05
-       u16     xIntHdlrOffset;         // Offset to IntHdlr array      x06-x07
-       u8      xMaxIntHdlrEntries;     // Number of entries in array   x08-x08
-       u8      xPrimaryLpIndex;        // LP Index of Primary          x09-x09
-       u8      xServiceLpIndex;        // LP Ind of Service Focal Pointx0A-x0A
-       u8      xLpIndex;               // LP Index                     x0B-x0B
-       u16     xMaxLpQueues;           // Number of allocated queues   x0C-x0D
-       u16     xLpQueueOffset;         // Offset to start of LP queues x0E-x0F
-       u8      xPirEnvironMode:8;      // Piranha or hardware          x10-x10
-       u8      xPirConsoleMode:8;      // Piranha console indicator    x11-x11
-       u8      xPirDasdMode:8;         // Piranha dasd indicator       x12-x12
-       u8      xRsvd1_0[5];            // Reserved for Piranha related x13-x17
-       u8      xLparInstalled:1;       // Is LPAR installed on system  x18-x1F
-       u8      xSysPartitioned:1;      // Is the system partitioned    ...
-       u8      xHwSyncedTBs:1;         // Hardware synced TBs          ...
-       u8      xIntProcUtilHmt:1;      // Utilize HMT for interrupts   ...
-       u8      xRsvd1_1:4;             // Reserved                     ...
-       u8      xSpVpdFormat:8;         // VPD areas are in CSP format  ...
-       u8      xIntProcRatio:8;        // Ratio of int procs to procs  ...
-       u8      xRsvd1_2[5];            // Reserved                     ...
-       u16     xRsvd1_3;               // Reserved                     x20-x21
-       u16     xPlicVrmIndex;          // VRM index of PLIC            x22-x23
-       u16     xMinSupportedSlicVrmInd;// Min supported OS VRM index   x24-x25
-       u16     xMinCompatableSlicVrmInd;// Min compatible OS VRM index x26-x27
-       u64     xLoadAreaAddr;          // ER address of load area      x28-x2F
-       u32     xLoadAreaChunks;        // Chunks for the load area     x30-x33
-       u32     xPaseSysCallCRMask;     // Mask used to test CR before  x34-x37
-                                       // doing an ASR switch on PASE
-                                       // system call.
-       u64     xSlicSegmentTablePtr;   // Pointer to Slic seg table.   x38-x3f
-       u8      xRsvd1_4[64];           //                              x40-x7F
-
-// CACHE_LINE_2 0x0080 - 0x00FF Contains local read-write data
-       u8      xRsvd2_0[128];          // Reserved                     x00-x7F
-
-// CACHE_LINE_3-6 0x0100 - 0x02FF Contains LP Queue indicators
-// NB: Padding required to keep xInterrruptHdlr at x300 which is required
-// for v4r4 PLIC.
-       u8      xOldLpQueue[128];       // LP Queue needed for v4r4     100-17F
-       u8      xRsvd3_0[384];          // Reserved                     180-2FF
-
-// CACHE_LINE_7-8 0x0300 - 0x03FF Contains the address of the OS interrupt
-//  handlers
-       u64     xInterruptHdlr[32];     // Interrupt handlers           300-x3FF
-};
-
-extern struct ItLpNaca         itLpNaca;
-
-#endif /* _ITLPNACA_H */