powerpc: Move LparData.c to powerpc platforms
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2005 03:42:26 +0000 (13:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2005 07:24:54 +0000 (17:24 +1000)
Also rename it to lpardata.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
arch/powerpc/platforms/iseries/Makefile
arch/powerpc/platforms/iseries/lpardata.c [new file with mode: 0644]
arch/ppc64/kernel/LparData.c [deleted file]
arch/ppc64/kernel/Makefile
arch/ppc64/kernel/head.S

index 3b7a31d4acdad32952b9893c8cc1392a1dd25e1e..095471d50d9fb3403f527961c3b68cd559f74854 100644 (file)
@@ -1 +1 @@
-obj-$(CONFIG_PPC_ISERIES) += hvcall.o hvlpconfig.o
+obj-$(CONFIG_PPC_ISERIES) += hvcall.o hvlpconfig.o lpardata.o
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
new file mode 100644 (file)
index 0000000..87b7ad8
--- /dev/null
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2001 Mike Corrigan, IBM Corp
+ *
+ * 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.
+ */
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/threads.h>
+#include <linux/module.h>
+#include <linux/bitops.h>
+#include <asm/processor.h>
+#include <asm/ptrace.h>
+#include <asm/naca.h>
+#include <asm/abs_addr.h>
+#include <asm/iSeries/ItLpNaca.h>
+#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>
+
+
+/* The HvReleaseData is the root of the information shared between
+ * the hypervisor and Linux.
+ */
+struct HvReleaseData hvReleaseData = {
+       .xDesc = 0xc8a5d9c4,    /* "HvRD" ebcdic */
+       .xSize = sizeof(struct HvReleaseData),
+       .xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
+       .xSlicNacaAddr = &naca,         /* 64-bit Naca address */
+       .xMsNucDataOffset = LPARMAP_PHYS,
+       .xFlags = HVREL_TAGSINACTIVE    /* tags inactive       */
+                                       /* 64 bit              */
+                                       /* shared processors   */
+                                       /* HMT allowed         */
+                 | 6,                  /* TEMP: This allows non-GA driver */
+       .xVrmIndex = 4,                 /* We are v5r2m0               */
+       .xMinSupportedPlicVrmIndex = 3,         /* v5r1m0 */
+       .xMinCompatablePlicVrmIndex = 3,        /* v5r1m0 */
+       .xVrmName = { 0xd3, 0x89, 0x95, 0xa4,   /* "Linux 2.4.64" ebcdic */
+               0xa7, 0x40, 0xf2, 0x4b,
+               0xf4, 0x4b, 0xf6, 0xf4 },
+};
+
+/*
+ * The NACA.  The first dword of the naca is required by the iSeries
+ * hypervisor to point to itVpdAreas.  The hypervisor finds the NACA
+ * through the pointer in hvReleaseData.
+ */
+struct naca_struct naca = {
+       .xItVpdAreas = &itVpdAreas,
+       .xRamDisk = 0,
+       .xRamDiskSize = 0,
+};
+
+extern void system_reset_iSeries(void);
+extern void machine_check_iSeries(void);
+extern void data_access_iSeries(void);
+extern void instruction_access_iSeries(void);
+extern void hardware_interrupt_iSeries(void);
+extern void alignment_iSeries(void);
+extern void program_check_iSeries(void);
+extern void fp_unavailable_iSeries(void);
+extern void decrementer_iSeries(void);
+extern void trap_0a_iSeries(void);
+extern void trap_0b_iSeries(void);
+extern void system_call_iSeries(void);
+extern void single_step_iSeries(void);
+extern void trap_0e_iSeries(void);
+extern void performance_monitor_iSeries(void);
+extern void data_access_slb_iSeries(void);
+extern void instruction_access_slb_iSeries(void);
+
+struct ItLpNaca itLpNaca = {
+       .xDesc = 0xd397d581,            /* "LpNa" ebcdic */
+       .xSize = 0x0400,                /* size of ItLpNaca */
+       .xIntHdlrOffset = 0x0300,       /* offset to int array */
+       .xMaxIntHdlrEntries = 19,       /* # ents */
+       .xPrimaryLpIndex = 0,           /* Part # of primary */
+       .xServiceLpIndex = 0,           /* Part # of serv */
+       .xLpIndex = 0,                  /* Part # of me */
+       .xMaxLpQueues = 0,              /* # of LP queues */
+       .xLpQueueOffset = 0x100,        /* offset of start of LP queues */
+       .xPirEnvironMode = 0,           /* Piranha stuff */
+       .xPirConsoleMode = 0,
+       .xPirDasdMode = 0,
+       .xLparInstalled = 0,
+       .xSysPartitioned = 0,
+       .xHwSyncedTBs = 0,
+       .xIntProcUtilHmt = 0,
+       .xSpVpdFormat = 0,
+       .xIntProcRatio = 0,
+       .xPlicVrmIndex = 0,             /* VRM index of PLIC */
+       .xMinSupportedSlicVrmInd = 0,   /* min supported SLIC */
+       .xMinCompatableSlicVrmInd = 0,  /* min compat SLIC */
+       .xLoadAreaAddr = 0,             /* 64-bit addr of load area */
+       .xLoadAreaChunks = 0,           /* chunks for load area */
+       .xPaseSysCallCRMask = 0,        /* PASE mask */
+       .xSlicSegmentTablePtr = 0,      /* seg table */
+       .xOldLpQueue = { 0 },           /* Old LP Queue */
+       .xInterruptHdlr = {
+               (u64)system_reset_iSeries,      /* 0x100 System Reset */
+               (u64)machine_check_iSeries,     /* 0x200 Machine Check */
+               (u64)data_access_iSeries,       /* 0x300 Data Access */
+               (u64)instruction_access_iSeries, /* 0x400 Instruction Access */
+               (u64)hardware_interrupt_iSeries, /* 0x500 External */
+               (u64)alignment_iSeries,         /* 0x600 Alignment */
+               (u64)program_check_iSeries,     /* 0x700 Program Check */
+               (u64)fp_unavailable_iSeries,    /* 0x800 FP Unavailable */
+               (u64)decrementer_iSeries,       /* 0x900 Decrementer */
+               (u64)trap_0a_iSeries,           /* 0xa00 Trap 0A */
+               (u64)trap_0b_iSeries,           /* 0xb00 Trap 0B */
+               (u64)system_call_iSeries,       /* 0xc00 System Call */
+               (u64)single_step_iSeries,       /* 0xd00 Single Step */
+               (u64)trap_0e_iSeries,           /* 0xe00 Trap 0E */
+               (u64)performance_monitor_iSeries,/* 0xf00 Performance Monitor */
+               0,                              /* int 0x1000 */
+               0,                              /* int 0x1010 */
+               0,                              /* int 0x1020 CPU ctls */
+               (u64)hardware_interrupt_iSeries, /* SC Ret Hdlr */
+               (u64)data_access_slb_iSeries,   /* 0x380 D-SLB */
+               (u64)instruction_access_slb_iSeries /* 0x480 I-SLB */
+       }
+};
+EXPORT_SYMBOL(itLpNaca);
+
+/* May be filled in by the hypervisor so cannot end up in the BSS */
+struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));
+
+/* May be filled in by the hypervisor so cannot end up in the BSS */
+struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));
+EXPORT_SYMBOL(xItExtVpdPanel);
+
+#define maxPhysicalProcessors 32
+
+struct IoHriProcessorVpd xIoHriProcessorVpd[maxPhysicalProcessors] = {
+       {
+               .xInstCacheOperandSize = 32,
+               .xDataCacheOperandSize = 32,
+               .xProcFreq     = 50000000,
+               .xTimeBaseFreq = 50000000,
+               .xPVR = 0x3600
+       }
+};
+
+/* Space for Main Store Vpd 27,200 bytes */
+/* May be filled in by the hypervisor so cannot end up in the BSS */
+u64    xMsVpd[3400] __attribute__((__section__(".data")));
+
+/* Space for Recovery Log Buffer */
+/* May be filled in by the hypervisor so cannot end up in the BSS */
+u64    xRecoveryLogBuffer[32] __attribute__((__section__(".data")));
+
+struct SpCommArea xSpCommArea = {
+       .xDesc = 0xE2D7C3C2,
+       .xFormat = 1,
+};
+
+/* The LparMap data is now located at offset 0x6000 in head.S
+ * It was put there so that the HvReleaseData could address it
+ * with a 32-bit offset as required by the iSeries hypervisor
+ *
+ * The Naca has a pointer to the ItVpdAreas.  The hypervisor finds
+ * the Naca via the HvReleaseData area.  The HvReleaseData has the
+ * offset into the Naca of the pointer to the ItVpdAreas.
+ */
+struct ItVpdAreas itVpdAreas = {
+       .xSlicDesc = 0xc9a3e5c1,                /* "ItVA" */
+       .xSlicSize = sizeof(struct ItVpdAreas),
+       .xSlicVpdEntries = ItVpdMaxEntries,     /* # VPD array entries */
+       .xSlicDmaEntries = ItDmaMaxEntries,     /* # DMA array entries */
+       .xSlicMaxLogicalProcs = NR_CPUS * 2,    /* Max logical procs */
+       .xSlicMaxPhysicalProcs = maxPhysicalProcessors, /* Max physical procs */
+       .xSlicDmaToksOffset = offsetof(struct ItVpdAreas, xPlicDmaToks),
+       .xSlicVpdAdrsOffset = offsetof(struct ItVpdAreas, xSlicVpdAdrs),
+       .xSlicDmaLensOffset = offsetof(struct ItVpdAreas, xPlicDmaLens),
+       .xSlicVpdLensOffset = offsetof(struct ItVpdAreas, xSlicVpdLens),
+       .xSlicMaxSlotLabels = 0,                /* max slot labels */
+       .xSlicMaxLpQueues = 1,                  /* max LP queues */
+       .xPlicDmaLens = { 0 },                  /* DMA lengths */
+       .xPlicDmaToks = { 0 },                  /* DMA tokens */
+       .xSlicVpdLens = {                       /* VPD lengths */
+               0,0,0,                  /*  0 - 2 */
+               sizeof(xItExtVpdPanel), /*       3 Extended VPD   */
+               sizeof(struct paca_struct),     /*       4 length of Paca  */
+               0,                      /*       5 */
+               sizeof(struct ItIplParmsReal),/* 6 length of IPL parms */
+               26992,                  /*       7 length of MS VPD */
+               0,                      /*       8 */
+               sizeof(struct ItLpNaca),/*       9 length of LP Naca */
+               0,                      /*      10 */
+               256,                    /*      11 length of Recovery Log Buf */
+               sizeof(struct SpCommArea), /*   12 length of SP Comm Area */
+               0,0,0,                  /* 13 - 15 */
+               sizeof(struct IoHriProcessorVpd),/* 16 length of Proc Vpd */
+               0,0,0,0,0,0,            /* 17 - 22  */
+               sizeof(struct hvlpevent_queue), /* 23 length of Lp Queue */
+               0,0                     /* 24 - 25 */
+               },
+       .xSlicVpdAdrs = {                       /* VPD addresses */
+               0,0,0,                  /*       0 -  2 */
+               &xItExtVpdPanel,        /*       3 Extended VPD */
+               &paca[0],               /*       4 first Paca */
+               0,                      /*       5 */
+               &xItIplParmsReal,       /*       6 IPL parms */
+               &xMsVpd,                /*       7 MS Vpd */
+               0,                      /*       8 */
+               &itLpNaca,              /*       9 LpNaca */
+               0,                      /*      10 */
+               &xRecoveryLogBuffer,    /*      11 Recovery Log Buffer */
+               &xSpCommArea,           /*      12 SP Comm Area */
+               0,0,0,                  /* 13 - 15 */
+               &xIoHriProcessorVpd,    /*      16 Proc Vpd */
+               0,0,0,0,0,0,            /* 17 - 22 */
+               &hvlpevent_queue,       /*      23 Lp Queue */
+               0,0
+       }
+};
diff --git a/arch/ppc64/kernel/LparData.c b/arch/ppc64/kernel/LparData.c
deleted file mode 100644 (file)
index 0a9c23c..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-/* 
- * Copyright 2001 Mike Corrigan, IBM Corp
- *
- * 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.
- */
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/threads.h>
-#include <linux/module.h>
-#include <linux/bitops.h>
-#include <asm/processor.h>
-#include <asm/ptrace.h>
-#include <asm/naca.h>
-#include <asm/abs_addr.h>
-#include <asm/iSeries/ItLpNaca.h>
-#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>
-
-
-/* The HvReleaseData is the root of the information shared between 
- * the hypervisor and Linux.  
- */
-struct HvReleaseData hvReleaseData = {
-       .xDesc = 0xc8a5d9c4,    /* "HvRD" ebcdic */
-       .xSize = sizeof(struct HvReleaseData),
-       .xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
-       .xSlicNacaAddr = &naca,         /* 64-bit Naca address */
-       .xMsNucDataOffset = LPARMAP_PHYS,
-       .xFlags = HVREL_TAGSINACTIVE    /* tags inactive       */
-                                       /* 64 bit              */
-                                       /* shared processors   */
-                                       /* HMT allowed         */
-                 | 6,                  /* TEMP: This allows non-GA driver */
-       .xVrmIndex = 4,                 /* We are v5r2m0               */
-       .xMinSupportedPlicVrmIndex = 3,         /* v5r1m0 */
-       .xMinCompatablePlicVrmIndex = 3,        /* v5r1m0 */
-       .xVrmName = { 0xd3, 0x89, 0x95, 0xa4,   /* "Linux 2.4.64" ebcdic */
-               0xa7, 0x40, 0xf2, 0x4b,
-               0xf4, 0x4b, 0xf6, 0xf4 },
-};
-
-/*
- * The NACA.  The first dword of the naca is required by the iSeries
- * hypervisor to point to itVpdAreas.  The hypervisor finds the NACA
- * through the pointer in hvReleaseData.
- */
-struct naca_struct naca = {
-       .xItVpdAreas = &itVpdAreas,
-       .xRamDisk = 0,
-       .xRamDiskSize = 0,
-};
-
-extern void system_reset_iSeries(void);
-extern void machine_check_iSeries(void);
-extern void data_access_iSeries(void);
-extern void instruction_access_iSeries(void);
-extern void hardware_interrupt_iSeries(void);
-extern void alignment_iSeries(void);
-extern void program_check_iSeries(void);
-extern void fp_unavailable_iSeries(void);
-extern void decrementer_iSeries(void);
-extern void trap_0a_iSeries(void);
-extern void trap_0b_iSeries(void);
-extern void system_call_iSeries(void);
-extern void single_step_iSeries(void);
-extern void trap_0e_iSeries(void);
-extern void performance_monitor_iSeries(void);
-extern void data_access_slb_iSeries(void);
-extern void instruction_access_slb_iSeries(void);
-       
-struct ItLpNaca itLpNaca = {
-       .xDesc = 0xd397d581,            /* "LpNa" ebcdic */
-       .xSize = 0x0400,                /* size of ItLpNaca */
-       .xIntHdlrOffset = 0x0300,       /* offset to int array */
-       .xMaxIntHdlrEntries = 19,       /* # ents */
-       .xPrimaryLpIndex = 0,           /* Part # of primary */
-       .xServiceLpIndex = 0,           /* Part # of serv */
-       .xLpIndex = 0,                  /* Part # of me */
-       .xMaxLpQueues = 0,              /* # of LP queues */
-       .xLpQueueOffset = 0x100,        /* offset of start of LP queues */
-       .xPirEnvironMode = 0,           /* Piranha stuff */
-       .xPirConsoleMode = 0,
-       .xPirDasdMode = 0,
-       .xLparInstalled = 0,
-       .xSysPartitioned = 0,
-       .xHwSyncedTBs = 0,
-       .xIntProcUtilHmt = 0,
-       .xSpVpdFormat = 0,
-       .xIntProcRatio = 0,
-       .xPlicVrmIndex = 0,             /* VRM index of PLIC */
-       .xMinSupportedSlicVrmInd = 0,   /* min supported SLIC */
-       .xMinCompatableSlicVrmInd = 0,  /* min compat SLIC */
-       .xLoadAreaAddr = 0,             /* 64-bit addr of load area */
-       .xLoadAreaChunks = 0,           /* chunks for load area */
-       .xPaseSysCallCRMask = 0,        /* PASE mask */
-       .xSlicSegmentTablePtr = 0,      /* seg table */
-       .xOldLpQueue = { 0 },           /* Old LP Queue */
-       .xInterruptHdlr = {
-               (u64)system_reset_iSeries,      /* 0x100 System Reset */
-               (u64)machine_check_iSeries,     /* 0x200 Machine Check */
-               (u64)data_access_iSeries,       /* 0x300 Data Access */
-               (u64)instruction_access_iSeries, /* 0x400 Instruction Access */
-               (u64)hardware_interrupt_iSeries, /* 0x500 External */
-               (u64)alignment_iSeries,         /* 0x600 Alignment */
-               (u64)program_check_iSeries,     /* 0x700 Program Check */
-               (u64)fp_unavailable_iSeries,    /* 0x800 FP Unavailable */
-               (u64)decrementer_iSeries,       /* 0x900 Decrementer */
-               (u64)trap_0a_iSeries,           /* 0xa00 Trap 0A */
-               (u64)trap_0b_iSeries,           /* 0xb00 Trap 0B */
-               (u64)system_call_iSeries,       /* 0xc00 System Call */
-               (u64)single_step_iSeries,       /* 0xd00 Single Step */
-               (u64)trap_0e_iSeries,           /* 0xe00 Trap 0E */
-               (u64)performance_monitor_iSeries,/* 0xf00 Performance Monitor */
-               0,                              /* int 0x1000 */
-               0,                              /* int 0x1010 */
-               0,                              /* int 0x1020 CPU ctls */
-               (u64)hardware_interrupt_iSeries, /* SC Ret Hdlr */
-               (u64)data_access_slb_iSeries,   /* 0x380 D-SLB */
-               (u64)instruction_access_slb_iSeries /* 0x480 I-SLB */
-       }
-};
-EXPORT_SYMBOL(itLpNaca);
-
-/* May be filled in by the hypervisor so cannot end up in the BSS */
-struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data"))); 
-
-/* May be filled in by the hypervisor so cannot end up in the BSS */
-struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));
-EXPORT_SYMBOL(xItExtVpdPanel);
-
-#define maxPhysicalProcessors 32
-
-struct IoHriProcessorVpd xIoHriProcessorVpd[maxPhysicalProcessors] = {
-       {
-               .xInstCacheOperandSize = 32,
-               .xDataCacheOperandSize = 32,
-               .xProcFreq     = 50000000,
-               .xTimeBaseFreq = 50000000,
-               .xPVR = 0x3600
-       }
-};
-       
-/* Space for Main Store Vpd 27,200 bytes */
-/* May be filled in by the hypervisor so cannot end up in the BSS */
-u64    xMsVpd[3400] __attribute__((__section__(".data")));
-
-/* Space for Recovery Log Buffer */
-/* May be filled in by the hypervisor so cannot end up in the BSS */
-u64    xRecoveryLogBuffer[32] __attribute__((__section__(".data")));
-
-struct SpCommArea xSpCommArea = {
-       .xDesc = 0xE2D7C3C2,
-       .xFormat = 1,
-};
-
-/* The LparMap data is now located at offset 0x6000 in head.S
- * It was put there so that the HvReleaseData could address it
- * with a 32-bit offset as required by the iSeries hypervisor
- *
- * The Naca has a pointer to the ItVpdAreas.  The hypervisor finds
- * the Naca via the HvReleaseData area.  The HvReleaseData has the
- * offset into the Naca of the pointer to the ItVpdAreas.
- */
-struct ItVpdAreas itVpdAreas = {
-       .xSlicDesc = 0xc9a3e5c1,                /* "ItVA" */
-       .xSlicSize = sizeof(struct ItVpdAreas),
-       .xSlicVpdEntries = ItVpdMaxEntries,     /* # VPD array entries */
-       .xSlicDmaEntries = ItDmaMaxEntries,     /* # DMA array entries */
-       .xSlicMaxLogicalProcs = NR_CPUS * 2,    /* Max logical procs */
-       .xSlicMaxPhysicalProcs = maxPhysicalProcessors, /* Max physical procs */
-       .xSlicDmaToksOffset = offsetof(struct ItVpdAreas, xPlicDmaToks),
-       .xSlicVpdAdrsOffset = offsetof(struct ItVpdAreas, xSlicVpdAdrs),
-       .xSlicDmaLensOffset = offsetof(struct ItVpdAreas, xPlicDmaLens),
-       .xSlicVpdLensOffset = offsetof(struct ItVpdAreas, xSlicVpdLens),
-       .xSlicMaxSlotLabels = 0,                /* max slot labels */
-       .xSlicMaxLpQueues = 1,                  /* max LP queues */
-       .xPlicDmaLens = { 0 },                  /* DMA lengths */
-       .xPlicDmaToks = { 0 },                  /* DMA tokens */
-       .xSlicVpdLens = {                       /* VPD lengths */
-               0,0,0,                  /*  0 - 2 */
-               sizeof(xItExtVpdPanel), /*       3 Extended VPD   */
-               sizeof(struct paca_struct),     /*       4 length of Paca  */
-               0,                      /*       5 */
-               sizeof(struct ItIplParmsReal),/* 6 length of IPL parms */
-               26992,                  /*       7 length of MS VPD */
-               0,                      /*       8 */
-               sizeof(struct ItLpNaca),/*       9 length of LP Naca */
-               0,                      /*      10 */
-               256,                    /*      11 length of Recovery Log Buf */
-               sizeof(struct SpCommArea), /*   12 length of SP Comm Area */
-               0,0,0,                  /* 13 - 15 */
-               sizeof(struct IoHriProcessorVpd),/* 16 length of Proc Vpd */
-               0,0,0,0,0,0,            /* 17 - 22  */
-               sizeof(struct hvlpevent_queue), /* 23 length of Lp Queue */
-               0,0                     /* 24 - 25 */
-               },
-       .xSlicVpdAdrs = {                       /* VPD addresses */
-               0,0,0,                  /*       0 -  2 */
-               &xItExtVpdPanel,        /*       3 Extended VPD */
-               &paca[0],               /*       4 first Paca */
-               0,                      /*       5 */
-               &xItIplParmsReal,       /*       6 IPL parms */
-               &xMsVpd,                /*       7 MS Vpd */
-               0,                      /*       8 */
-               &itLpNaca,              /*       9 LpNaca */
-               0,                      /*      10 */
-               &xRecoveryLogBuffer,    /*      11 Recovery Log Buffer */
-               &xSpCommArea,           /*      12 SP Comm Area */
-               0,0,0,                  /* 13 - 15 */
-               &xIoHriProcessorVpd,    /*      16 Proc Vpd */
-               0,0,0,0,0,0,            /* 17 - 22 */
-               &hvlpevent_queue,       /*      23 Lp Queue */
-               0,0
-       }
-};
index c80b6174231eb8a6c40ecee3552d42ac35d57f28..4d95f0d0137a4fbc9c78e8920635920b7fa31126 100644 (file)
@@ -22,8 +22,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM)   += pci_dn.o pci_direct_iommu.o
 
 obj-$(CONFIG_PCI)      += pci.o pci_iommu.o iomap.o $(pci-obj-y)
 
-obj-$(CONFIG_PPC_ISERIES) += LparData.o \
-                            iSeries_setup.o ItLpQueue.o hvCall.o \
+obj-$(CONFIG_PPC_ISERIES) += iSeries_setup.o ItLpQueue.o hvCall.o \
                             mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \
                             iSeries_iommu.o
 
index eb526c480b6c1724ff1e1915da8e7ec4b1161286..db0cd35876278d4e5bd54726145ee7900c18ef34 100644 (file)
@@ -1253,7 +1253,7 @@ unrecov_slb:
  *
  * On iSeries, the hypervisor must fill in at least one entry before
  * we get control (with relocate on).  The address is give to the hv
- * as a page number (see xLparMap in LparData.c), so this must be at a
+ * as a page number (see xLparMap in lpardata.c), so this must be at a
  * fixed address (the linker can't compute (u64)&initial_stab >>
  * PAGE_SHIFT).
  */