diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2007-10-19 20:35:02 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-19 20:35:02 +0200 |
commit | 7778887880d278c23dc0975210df0381c878ae1e (patch) | |
tree | 4c286d6a8d6467eaea9424b283b634934de02f87 /arch/x86/kernel/setup64.c | |
parent | af93ebc0b3ed8cdf93a6ed4bc1fab548f8059d0a (diff) | |
download | linux-7778887880d278c23dc0975210df0381c878ae1e.tar.gz linux-7778887880d278c23dc0975210df0381c878ae1e.tar.bz2 linux-7778887880d278c23dc0975210df0381c878ae1e.zip |
x86: merge init_task_32/64.c
Merge init_task_32/64.c.
Move 64bit per cpu data orig_ist to setup64.c.
[ mingo: fixed checkpatch trivialities. ]
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup64.c')
-rw-r--r-- | arch/x86/kernel/setup64.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c index ba9188235057..e11886e8d8ca 100644 --- a/arch/x86/kernel/setup64.c +++ b/arch/x86/kernel/setup64.c @@ -185,6 +185,12 @@ void __cpuinit check_efer(void) unsigned long kernel_eflags; /* + * Copies of the original ist values from the tss are only accessed during + * debugging, no special alignment required. + */ +DEFINE_PER_CPU(struct orig_ist, orig_ist); + +/* * cpu_init() initializes state that is per-CPU. Some data is already * initialized (naturally) in the bootstrap process, such as the GDT * and IDT. We reload them nevertheless, this function acts as a |