hc
2024-05-10 748e4f3d702def1a4bff191e0cf93b6a05340f01
kernel/arch/sparc/kernel/sbus.c
....@@ -15,6 +15,7 @@
1515 #include <linux/interrupt.h>
1616 #include <linux/of.h>
1717 #include <linux/of_device.h>
18
+#include <linux/numa.h>
1819
1920 #include <asm/page.h>
2021 #include <asm/io.h>
....@@ -67,8 +68,8 @@
6768
6869 regs = of_get_property(op->dev.of_node, "reg", NULL);
6970 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);
7273 return;
7374 }
7475 slot = regs->which_io;
....@@ -561,7 +562,7 @@
561562
562563 op->dev.archdata.iommu = iommu;
563564 op->dev.archdata.stc = strbuf;
564
- op->dev.archdata.numa_node = -1;
565
+ op->dev.archdata.numa_node = NUMA_NO_NODE;
565566
566567 reg_base = regs + SYSIO_IOMMUREG_BASE;
567568 iommu->iommu_control = reg_base + IOMMU_CONTROL;