diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-01-18 18:38:58 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-18 18:38:58 +0300 |
| commit | ea9279066de44053d0c20ea855bc9f4706652d84 (patch) | |
| tree | 73c19b9112375ee0df8373b004105f05e1a196f4 /arch/x86/include/asm/pda.h | |
| parent | 92d65b2371d86d40807e1dbfdccadc4d501edcde (diff) | |
| download | linux-ea9279066de44053d0c20ea855bc9f4706652d84.tar.xz | |
x86-64: Move cpu number from PDA to per-cpu and consolidate with 32-bit.
tj: moved cpu_number definition out of CONFIG_HAVE_SETUP_PER_CPU_AREA
for voyager.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/pda.h')
| -rw-r--r-- | arch/x86/include/asm/pda.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pda.h b/arch/x86/include/asm/pda.h index 09965f7a2165..668d5a5b6f70 100644 --- a/arch/x86/include/asm/pda.h +++ b/arch/x86/include/asm/pda.h @@ -16,7 +16,7 @@ struct x8664_pda { unsigned long kernelstack; /* 16 top of kernel stack for current */ unsigned long oldrsp; /* 24 user rsp for system call */ int irqcount; /* 32 Irq nesting counter. Starts -1 */ - unsigned int cpunumber; /* 36 Logical CPU number */ + unsigned int unused6; /* 36 was cpunumber */ #ifdef CONFIG_CC_STACKPROTECTOR unsigned long stack_canary; /* 40 stack canary value */ /* gcc-ABI: this canary MUST be at |