x86: convert cpuinfo_x86 array to a per_cpu array

cpu_data is currently an array defined using NR_CPUS.  This means that
we overallocate since we will rarely really use maximum configured cpus.
When NR_CPU count is raised to 4096 the size of cpu_data becomes
3,145,728 bytes.

These changes were adopted from the sparc64 (and ia64) code.  An
additional field was added to cpuinfo_x86 to be a non-ambiguous cpu
index.  This corresponds to the index into a cpumask_t as well as the
per_cpu index.  It's used in various places like show_cpuinfo().

cpu_data is defined to be the boot_cpu_data structure for the NON-SMP
case.

Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Christoph Lameter <clameter@sgi.com>
Cc: Andi Kleen <ak@suse.de>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index e87a3939ed40..b8a7cf671432 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -181,8 +181,8 @@ int recalibrate_cpu_khz(void)
         if (cpu_has_tsc) {
                 cpu_khz = calculate_cpu_khz();
                 tsc_khz = cpu_khz;
-                cpu_data[0].loops_per_jiffy =
-                        cpufreq_scale(cpu_data[0].loops_per_jiffy,
+                cpu_data(0).loops_per_jiffy =
+                        cpufreq_scale(cpu_data(0).loops_per_jiffy,
                                         cpu_khz_old, cpu_khz);
                 return 0;
         } else
@@ -215,7 +215,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data)
                         return 0;
                 }
                 ref_freq = freq->old;
-                loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy;
+                loops_per_jiffy_ref = cpu_data(freq->cpu).loops_per_jiffy;
                 cpu_khz_ref = cpu_khz;
         }
 
@@ -223,7 +223,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data)
             (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) ||
             (val == CPUFREQ_RESUMECHANGE)) {
                 if (!(freq->flags & CPUFREQ_CONST_LOOPS))
-                        cpu_data[freq->cpu].loops_per_jiffy =
+                        cpu_data(freq->cpu).loops_per_jiffy =
                                 cpufreq_scale(loops_per_jiffy_ref,
                                                 ref_freq, freq->new);