OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cpumask: put cpumask_of_cpu_map in the initdata section 

* Create the cpumask_of_cpu_map statically in the init data section
    using NR_CPUS but replace it during boot up with one sized by
    nr_cpu_ids (num possible cpus).

Signed-off-by: Mike Travis <travis@sgi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jack Steiner <steiner@sgi.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Mike Travis 2008-07-24 18:21:30 -07:00 committed by Ingo Molnar
parent b8d317d10c
commit 6524d938b3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/setup_percpu.c
View File

@ -81,10 +81,12 @@ static void __init setup_per_cpu_maps(void)
} }
#ifdef CONFIG_HAVE_CPUMASK_OF_CPU_MAP #ifdef CONFIG_HAVE_CPUMASK_OF_CPU_MAP
cpumask_t *cpumask_of_cpu_map __read_mostly; /*
EXPORT_SYMBOL(cpumask_of_cpu_map); * Replace static cpumask_of_cpu_map in the initdata section,
* with one that's allocated sized by the possible number of cpus.
/* requires nr_cpu_ids to be initialized */ *
* (requires nr_cpu_ids to be initialized)
*/
static void __init setup_cpumask_of_cpu(void) static void __init setup_cpumask_of_cpu(void)
{ {
int i; int i;

8
kernel/cpu.c
View File

@ -462,7 +462,6 @@ out:
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
#ifndef CONFIG_HAVE_CPUMASK_OF_CPU_MAP
/* 64 bits of zeros, for initializers. */ /* 64 bits of zeros, for initializers. */
#if BITS_PER_LONG == 32 #if BITS_PER_LONG == 32
#define Z64 0, 0 #define Z64 0, 0
@ -509,7 +508,11 @@ out:
/* We want this statically initialized, just to be safe. We try not /* We want this statically initialized, just to be safe. We try not
* to waste too much space, either. */ * to waste too much space, either. */
static const cpumask_t cpumask_map[] = { static const cpumask_t cpumask_map[]
#ifdef CONFIG_HAVE_CPUMASK_OF_CPU_MAP
__initdata
#endif
= {
CMI0(0), CMI0(1), CMI0(2), CMI0(3), CMI0(0), CMI0(1), CMI0(2), CMI0(3),
#if NR_CPUS > 4 #if NR_CPUS > 4
CMI0(4), CMI0(5), CMI0(6), CMI0(7), CMI0(4), CMI0(5), CMI0(6), CMI0(7),
@ -569,4 +572,3 @@ static const cpumask_t cpumask_map[] = {
}; };
const cpumask_t *cpumask_of_cpu_map = cpumask_map; const cpumask_t *cpumask_of_cpu_map = cpumask_map;
#endif /* !CONFIG_HAVE_CPUMASK_OF_CPU_MAP */