sparc: replace uses of CPU_MASK_ALL_PTR
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 15 Jun 2009 10:06:18 +0000 (03:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Jun 2009 11:56:55 +0000 (04:56 -0700)
CPU_MASK_ALL is the (deprecated) "all bits set" cpumask, defined as so:

#define CPU_MASK_ALL (cpumask_t) { { ... } }

Taking the address of such a temporary is questionable at best,
unfortunately 321a8e9d (cpumask: add CPU_MASK_ALL_PTR macro) added
CPU_MASK_ALL_PTR:

#define CPU_MASK_ALL_PTR (&CPU_MASK_ALL)

Which formalizes this practice.  One day gcc could bite us over this
usage (though we seem to have gotten away with it so far).

[Description by Rusty Russell]
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/kernel/smp_64.c
arch/sparc/mm/init_64.c

index cfb3d06..fa44eaf 100644 (file)
@@ -1542,5 +1542,5 @@ void __init setup_per_cpu_areas(void)
 
        of_fill_in_cpu_data();
        if (tlb_type == hypervisor)
-               mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
+               mdesc_fill_in_cpu_data(cpu_all_mask);
 }
index b5a5932..ca92e2f 100644 (file)
@@ -1799,7 +1799,7 @@ void __init paging_init(void)
 
        if (tlb_type == hypervisor) {
                sun4v_mdesc_init();
-               mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
+               mdesc_populate_present_mask(cpu_all_mask);
        }
 
        /* Once the OF device tree and MDESC have been setup, we know