Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / ia64 / sn / kernel / sn2 / sn_hwperf.c

diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index b632b9c1e3b3e1785ffdc6b678e495c59b805dba..33367996d72d595b180179977b4a20e6c3b929bc 100644 (file)
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -189,7 +189,7 @@ static void print_pci_topology(struct seq_file *s)
        int e;
 
        for (sz = PAGE_SIZE; sz < 16 * PAGE_SIZE; sz += PAGE_SIZE) {
-               if (!(p = (char *)kmalloc(sz, GFP_KERNEL)))
+               if (!(p = kmalloc(sz, GFP_KERNEL)))
                        break;
                e = ia64_sn_ioif_get_pci_topology(__pa(p), sz);
                if (e == SALRET_OK)
@@ -423,7 +423,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
                        "coherency_domain %d, "
                        "region_size %d\n",
 
-                       partid, system_utsname.nodename,
+                       partid, utsname()->nodename,
                        shubtype ? "shub2" : "shub1", 
                        (u64)nasid_mask << nasid_shift, nasid_msb, nasid_shift,
                        system_size, sharing_size, coher, region_size);