diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-15 06:06:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-16 07:56:55 -0400 |
commit | 6ac5c610828c051666f667d2bdbd51fc15a59e98 (patch) | |
tree | b4db162651fbfc64bb07d2f0a6c754849e5bc820 /arch | |
parent | 9be12f9b1c4fd5f18cc82c170a32bfe1713ba76d (diff) |
sparc: replace uses of CPU_MASK_ALL_PTR
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/smp_64.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/init_64.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index cfb3d06058ff..fa44eaf8d897 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c | |||
@@ -1542,5 +1542,5 @@ void __init setup_per_cpu_areas(void) | |||
1542 | 1542 | ||
1543 | of_fill_in_cpu_data(); | 1543 | of_fill_in_cpu_data(); |
1544 | if (tlb_type == hypervisor) | 1544 | if (tlb_type == hypervisor) |
1545 | mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR); | 1545 | mdesc_fill_in_cpu_data(cpu_all_mask); |
1546 | } | 1546 | } |
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index b5a5932def77..ca92e2f54e4d 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -1799,7 +1799,7 @@ void __init paging_init(void) | |||
1799 | 1799 | ||
1800 | if (tlb_type == hypervisor) { | 1800 | if (tlb_type == hypervisor) { |
1801 | sun4v_mdesc_init(); | 1801 | sun4v_mdesc_init(); |
1802 | mdesc_populate_present_mask(CPU_MASK_ALL_PTR); | 1802 | mdesc_populate_present_mask(cpu_all_mask); |
1803 | } | 1803 | } |
1804 | 1804 | ||
1805 | /* Once the OF device tree and MDESC have been setup, we know | 1805 | /* Once the OF device tree and MDESC have been setup, we know |