diff options
author | Tejun Heo <tj@kernel.org> | 2009-01-13 20:41:35 +0900 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 14:19:40 +0100 |
commit | c8f3329a0ddd751241e96b4100df7eda14b2cbc6 (patch) | |
tree | 55e201da3d0d26076d4e31ef68aad26bf9f3e08c /arch/x86/include/asm/pda.h | |
parent | f32ff5388d86518c0375ccdb330d3b459b9c405e (diff) | |
download | linux-c8f3329a0ddd751241e96b4100df7eda14b2cbc6.tar.gz linux-c8f3329a0ddd751241e96b4100df7eda14b2cbc6.tar.bz2 linux-c8f3329a0ddd751241e96b4100df7eda14b2cbc6.zip |
x86: use static _cpu_pda array
_cpu_pda array first uses statically allocated storage in data.init
and then switches to allocated bootmem to conserve space. However,
after folding pda area into percpu area, _cpu_pda array will be
removed completely. Drop the reallocation part to simplify the code
for soon-to-follow changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/pda.h')
-rw-r--r-- | arch/x86/include/asm/pda.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pda.h b/arch/x86/include/asm/pda.h index cbd3f48a8320..2d5b49c3248e 100644 --- a/arch/x86/include/asm/pda.h +++ b/arch/x86/include/asm/pda.h @@ -5,6 +5,7 @@ #include <linux/stddef.h> #include <linux/types.h> #include <linux/cache.h> +#include <linux/threads.h> #include <asm/page.h> /* Per processor datastructure. %gs points to it while the kernel runs */ @@ -39,7 +40,7 @@ struct x8664_pda { unsigned irq_spurious_count; } ____cacheline_aligned_in_smp; -extern struct x8664_pda **_cpu_pda; +extern struct x8664_pda *_cpu_pda[NR_CPUS]; extern void pda_init(int); #define cpu_pda(i) (_cpu_pda[i]) |