git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ppc64
/
kernel
/
pSeries_iommu.c
diff --git
a/arch/ppc64/kernel/pSeries_iommu.c
b/arch/ppc64/kernel/pSeries_iommu.c
index
367da0e
..
9174917
100644
(file)
--- a/
arch/ppc64/kernel/pSeries_iommu.c
+++ b/
arch/ppc64/kernel/pSeries_iommu.c
@@
-147,7
+147,7
@@
static void iommu_buses_init_lpar(struct list_head *bus_list)
bus = pci_bus_b(ln);
busdn = PCI_GET_DN(bus);
bus = pci_bus_b(ln);
busdn = PCI_GET_DN(bus);
- dma_window = (unsigned int *)get_property(busdn, "ibm,dma-window",
0
);
+ dma_window = (unsigned int *)get_property(busdn, "ibm,dma-window",
NULL
);
if (dma_window) {
/* Bussubno hasn't been copied yet.
* Do it now because iommu_table_setparms_lpar needs it.
if (dma_window) {
/* Bussubno hasn't been copied yet.
* Do it now because iommu_table_setparms_lpar needs it.
@@
-231,7
+231,7
@@
static void iommu_table_setparms_lpar(struct pci_controller *phb,
{
unsigned int *dma_window;
{
unsigned int *dma_window;
- dma_window = (unsigned int *)get_property(dn, "ibm,dma-window",
0
);
+ dma_window = (unsigned int *)get_property(dn, "ibm,dma-window",
NULL
);
if (!dma_window)
panic("iommu_table_setparms_lpar: device %s has no"
if (!dma_window)
panic("iommu_table_setparms_lpar: device %s has no"