Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / sparc / kernel / of_device_64.c

diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 322046cdf85f2298da755944d381537c585188be..b4a12c9aa5f823d7ed1b35de8ed8404df05bd807 100644 (file)
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -554,7 +554,7 @@ static void __init build_device_resources(struct of_device *op,
                memset(r, 0, sizeof(*r));
 
                if (of_resource_verbose)
-                       printk("%s reg[%d] -> %lx\n",
+                       printk("%s reg[%d] -> %llx\n",
                               op->node->full_name, index,
                               result);
 
@@ -778,7 +778,7 @@ static unsigned int __init build_one_device_irq(struct of_device *op,
 out:
        nid = of_node_to_nid(dp);
        if (nid != -1) {
-               cpumask_t numa_mask = node_to_cpumask(nid);
+               cpumask_t numa_mask = *cpumask_of_node(nid);
 
                irq_set_affinity(irq, &numa_mask);
        }