summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/devicetree.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-08-17 10:50:48 +0200
committerIngo Molnar <mingo@kernel.org>2017-08-17 10:50:48 +0200
commit2257e268b1154966c5b0141b23695db1043ff39d (patch)
treedae4b032afb9872568cf7921b39d30c79a6c3fee /arch/x86/kernel/devicetree.c
parent27aac20574110abfd594175a668dc58b23b2b14a (diff)
parentac9a40905a610fb02086a37b11ff4bf046825a88 (diff)
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/devicetree.c')
-rw-r--r--arch/x86/kernel/devicetree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 3fe45f84ced4..cbf1f6ba39a8 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -235,8 +235,7 @@ static void __init dtb_add_ioapic(struct device_node *dn)
ret = of_address_to_resource(dn, 0, &r);
if (ret) {
- printk(KERN_ERR "Can't obtain address from node %s.\n",
- dn->full_name);
+ printk(KERN_ERR "Can't obtain address from device node %pOF.\n", dn);
return;
}
mp_register_ioapic(++ioapic_id, r.start, gsi_top, &cfg);