Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92cb7612 authored by Mike Travis's avatar Mike Travis Committed by Thomas Gleixner
Browse files

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: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarChristoph 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f1df280f

arch/x86/kernel/acpi/cstate.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,

					unsigned int cpu)

{

	struct cpuinfo_x86 *c = cpu_data + cpu;

	struct cpuinfo_x86 *c = &cpu_data(cpu);



	flags->bm_check = 0;

	if (num_online_cpus() == 1)
@@ -72,7 +72,7 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu, 
		struct acpi_processor_cx *cx, struct acpi_power_register *reg)

{

	struct cstate_entry *percpu_entry;

	struct cpuinfo_x86 *c = cpu_data + cpu;

	struct cpuinfo_x86 *c = &cpu_data(cpu);



	cpumask_t saved_mask;

	int retval;

arch/x86/kernel/acpi/processor.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c) 
void arch_acpi_processor_init_pdc(struct acpi_processor *pr)

{

	unsigned int cpu = pr->id;

	struct cpuinfo_x86 *c = cpu_data + cpu;

	struct cpuinfo_x86 *c = &cpu_data(cpu);



	pr->pdc = NULL;

	if (c->x86_vendor == X86_VENDOR_INTEL)

arch/x86/kernel/alternative.c

+3 −3
Original line number Diff line number Diff line
@@ -357,14 +357,14 @@ void alternatives_smp_switch(int smp) 
	if (smp) {

		printk(KERN_INFO "SMP alternatives: switching to SMP code\n");

		clear_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability);

		clear_bit(X86_FEATURE_UP, cpu_data[0].x86_capability);

		clear_bit(X86_FEATURE_UP, cpu_data(0).x86_capability);

		list_for_each_entry(mod, &smp_alt_modules, next)

			alternatives_smp_lock(mod->locks, mod->locks_end,

					      mod->text, mod->text_end);

	} else {

		printk(KERN_INFO "SMP alternatives: switching to UP code\n");

		set_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability);

		set_bit(X86_FEATURE_UP, cpu_data[0].x86_capability);

		set_bit(X86_FEATURE_UP, cpu_data(0).x86_capability);

		list_for_each_entry(mod, &smp_alt_modules, next)

			alternatives_smp_unlock(mod->locks, mod->locks_end,

						mod->text, mod->text_end);
@@ -432,7 +432,7 @@ void __init alternative_instructions(void) 
		if (1 == num_possible_cpus()) {

			printk(KERN_INFO "SMP alternatives: switching to UP code\n");

			set_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability);

			set_bit(X86_FEATURE_UP, cpu_data[0].x86_capability);

			set_bit(X86_FEATURE_UP, cpu_data(0).x86_capability);

			alternatives_smp_unlock(__smp_locks, __smp_locks_end,

						_text, _etext);

		}

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static unsigned int acpi_pstate_strict; 


static int check_est_cpu(unsigned int cpuid)

{

	struct cpuinfo_x86 *cpu = &cpu_data[cpuid];

	struct cpuinfo_x86 *cpu = &cpu_data(cpuid);



	if (cpu->x86_vendor != X86_VENDOR_INTEL ||

	    !cpu_has(cpu, X86_FEATURE_EST))
@@ -560,7 +560,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	unsigned int cpu = policy->cpu;

	struct acpi_cpufreq_data *data;

	unsigned int result = 0;

	struct cpuinfo_x86 *c = &cpu_data[policy->cpu];

	struct cpuinfo_x86 *c = &cpu_data(policy->cpu);

	struct acpi_processor_performance *perf;



	dprintk("acpi_cpufreq_cpu_init\n");

arch/x86/kernel/cpu/cpufreq/e_powersaver.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static struct cpufreq_driver eps_driver = { 


static int __init eps_init(void)

{

	struct cpuinfo_x86 *c = cpu_data;

	struct cpuinfo_x86 *c = &cpu_data(0);



	/* This driver will work only on Centaur C7 processors with

	 * Enhanced SpeedStep/PowerSaver registers */