aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2009-01-18 10:38:58 -0500
committerTejun Heo <tj@kernel.org>2009-01-18 10:38:58 -0500
commit5689553076c4a67b83426b076082c63085b7567a (patch)
tree982dac3bceff2dbdb7b962c24b068b5f6e72ccd1 /arch/x86/kernel/cpu
parent3d1e42a7cf945e289d6ba26159aa0e2b0645401b (diff)
x86-64: Move irqcount from PDA to per-cpu.
tj: s/irqcount/irq_count/ Signed-off-by: Brian Gerst <brgerst@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 06b6290088f4..e2323ecce1d3 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -893,6 +893,8 @@ DEFINE_PER_CPU(unsigned long, kernel_stack) =
893 (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE; 893 (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
894EXPORT_PER_CPU_SYMBOL(kernel_stack); 894EXPORT_PER_CPU_SYMBOL(kernel_stack);
895 895
896DEFINE_PER_CPU(unsigned int, irq_count) = -1;
897
896void __cpuinit pda_init(int cpu) 898void __cpuinit pda_init(int cpu)
897{ 899{
898 struct x8664_pda *pda = cpu_pda(cpu); 900 struct x8664_pda *pda = cpu_pda(cpu);
@@ -903,8 +905,6 @@ void __cpuinit pda_init(int cpu)
903 905
904 load_pda_offset(cpu); 906 load_pda_offset(cpu);
905 907
906 pda->irqcount = -1;
907
908 if (cpu != 0) { 908 if (cpu != 0) {
909 if (pda->nodenumber == 0 && cpu_to_node(cpu) != NUMA_NO_NODE) 909 if (pda->nodenumber == 0 && cpu_to_node(cpu) != NUMA_NO_NODE)
910 pda->nodenumber = cpu_to_node(cpu); 910 pda->nodenumber = cpu_to_node(cpu);