powerpc: Get iseries to compile with ARCH=powerpc

This moves the Device_List member from struct device_node to
struct pci_dn, which cleans up the device_node and makes the code
a little simpler.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/iseries/hvcall.S b/arch/powerpc/platforms/iseries/hvcall.S
index 9901c0e..07ae6ad 100644 (file)
--- a/arch/powerpc/platforms/iseries/hvcall.S
+++ b/arch/powerpc/platforms/iseries/hvcall.S
@@ -10,6 +10,7 @@
 
 #include <asm/ppc_asm.h>
 #include <asm/processor.h>
+#include <asm/ptrace.h>                /* XXX for STACK_FRAME_OVERHEAD */
 
        .text
 

diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index 9ac735d..e40c50b 100644 (file)
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -89,11 +89,10 @@ static void tce_free_iSeries(struct iommu_table *tbl, long index, long npages)
  */
 static struct iommu_table *iommu_table_find(struct iommu_table * tbl)
 {
-       struct device_node *dp;
-
-       list_for_each_entry(dp, &iSeries_Global_Device_List, Device_List) {
-               struct iommu_table *it = PCI_DN(dp)->iommu_table;
+       struct pci_dn *pdn;
 
+       list_for_each_entry(pdn, &iSeries_Global_Device_List, Device_List) {
+               struct iommu_table *it = pdn->iommu_table;
                if ((it != NULL) &&
                    (it->it_type == TCE_PCI) &&
                    (it->it_offset == tbl->it_offset) &&

diff --cc arch/powerpc/platforms/iseries/pci.c
Simple merge

diff --cc include/asm-ppc64/pci-bridge.h
Simple merge