diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 13:17:13 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 13:17:34 +0400 |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /arch/ia64/include/asm/smp.h | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
| download | linux-44347d947f628060b92449702071bfe1d31dfb75.tar.xz | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/include/asm/smp.h')
| -rw-r--r-- | arch/ia64/include/asm/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/smp.h b/arch/ia64/include/asm/smp.h index 598408336251..d217d1d4e051 100644 --- a/arch/ia64/include/asm/smp.h +++ b/arch/ia64/include/asm/smp.h @@ -58,7 +58,7 @@ extern struct smp_boot_data { extern char no_int_routing __devinitdata; extern cpumask_t cpu_core_map[NR_CPUS]; -DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); +DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); extern int smp_num_siblings; extern void __iomem *ipi_base_addr; extern unsigned char smp_int_redirect; |