diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/kernel/smp.c | |
| parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
| parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) | |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/kernel/smp.c')
| -rw-r--r-- | arch/ia64/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index 5230eaafd83f..f0c521b0ba4c 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c | |||
| @@ -66,7 +66,7 @@ static DEFINE_PER_CPU(unsigned short, shadow_flush_counts[NR_CPUS]) ____cachelin | |||
| 66 | #define IPI_KDUMP_CPU_STOP 3 | 66 | #define IPI_KDUMP_CPU_STOP 3 |
| 67 | 67 | ||
| 68 | /* This needs to be cacheline aligned because it is written to by *other* CPUs. */ | 68 | /* This needs to be cacheline aligned because it is written to by *other* CPUs. */ |
| 69 | static DEFINE_PER_CPU_SHARED_ALIGNED(u64, ipi_operation); | 69 | static DEFINE_PER_CPU_SHARED_ALIGNED(unsigned long, ipi_operation); |
| 70 | 70 | ||
| 71 | extern void cpu_halt (void); | 71 | extern void cpu_halt (void); |
| 72 | 72 | ||