diff options
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/system-bus.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index e06420af5fe9..ef92e7146215 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -556,11 +556,11 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev) | |||
556 | * node's iommu. We -might- do something smarter later though it may | 556 | * node's iommu. We -might- do something smarter later though it may |
557 | * never be necessary | 557 | * never be necessary |
558 | */ | 558 | */ |
559 | iommu = cell_iommu_for_node(archdata->numa_node); | 559 | iommu = cell_iommu_for_node(dev_to_node(dev)); |
560 | if (iommu == NULL || list_empty(&iommu->windows)) { | 560 | if (iommu == NULL || list_empty(&iommu->windows)) { |
561 | printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n", | 561 | printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n", |
562 | archdata->of_node ? archdata->of_node->full_name : "?", | 562 | archdata->of_node ? archdata->of_node->full_name : "?", |
563 | archdata->numa_node); | 563 | dev_to_node(dev)); |
564 | return NULL; | 564 | return NULL; |
565 | } | 565 | } |
566 | window = list_entry(iommu->windows.next, struct iommu_window, list); | 566 | window = list_entry(iommu->windows.next, struct iommu_window, list); |
@@ -577,7 +577,7 @@ static void *dma_fixed_alloc_coherent(struct device *dev, size_t size, | |||
577 | return iommu_alloc_coherent(dev, cell_get_iommu_table(dev), | 577 | return iommu_alloc_coherent(dev, cell_get_iommu_table(dev), |
578 | size, dma_handle, | 578 | size, dma_handle, |
579 | device_to_mask(dev), flag, | 579 | device_to_mask(dev), flag, |
580 | dev->archdata.numa_node); | 580 | dev_to_node(dev)); |
581 | else | 581 | else |
582 | return dma_direct_ops.alloc_coherent(dev, size, dma_handle, | 582 | return dma_direct_ops.alloc_coherent(dev, size, dma_handle, |
583 | flag); | 583 | flag); |
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c index 280ee88cb0b0..a789bf58ca8b 100644 --- a/arch/powerpc/platforms/ps3/system-bus.c +++ b/arch/powerpc/platforms/ps3/system-bus.c | |||
@@ -762,7 +762,7 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev) | |||
762 | }; | 762 | }; |
763 | 763 | ||
764 | dev->core.archdata.of_node = NULL; | 764 | dev->core.archdata.of_node = NULL; |
765 | dev->core.archdata.numa_node = 0; | 765 | set_dev_node(&dev->core, 0); |
766 | 766 | ||
767 | pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id); | 767 | pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id); |
768 | 768 | ||