.. | .. |
---|
15 | 15 | #include <linux/interrupt.h> |
---|
16 | 16 | #include <linux/of.h> |
---|
17 | 17 | #include <linux/of_device.h> |
---|
| 18 | +#include <linux/numa.h> |
---|
18 | 19 | |
---|
19 | 20 | #include <asm/page.h> |
---|
20 | 21 | #include <asm/io.h> |
---|
.. | .. |
---|
67 | 68 | |
---|
68 | 69 | regs = of_get_property(op->dev.of_node, "reg", NULL); |
---|
69 | 70 | if (!regs) { |
---|
70 | | - printk(KERN_ERR "sbus_set_sbus64: Cannot find regs for %s\n", |
---|
71 | | - op->dev.of_node->full_name); |
---|
| 71 | + printk(KERN_ERR "sbus_set_sbus64: Cannot find regs for %pOF\n", |
---|
| 72 | + op->dev.of_node); |
---|
72 | 73 | return; |
---|
73 | 74 | } |
---|
74 | 75 | slot = regs->which_io; |
---|
.. | .. |
---|
561 | 562 | |
---|
562 | 563 | op->dev.archdata.iommu = iommu; |
---|
563 | 564 | op->dev.archdata.stc = strbuf; |
---|
564 | | - op->dev.archdata.numa_node = -1; |
---|
| 565 | + op->dev.archdata.numa_node = NUMA_NO_NODE; |
---|
565 | 566 | |
---|
566 | 567 | reg_base = regs + SYSIO_IOMMUREG_BASE; |
---|
567 | 568 | iommu->iommu_control = reg_base + IOMMU_CONTROL; |
---|