diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-06 12:03:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-06 12:03:10 -0800 |
| commit | 07675f484bb9de0c4bd0722e174cb27043dbacef (patch) | |
| tree | a82f9378da66021881c06a348eb3e767ded4e04f /arch/x86/include | |
| parent | 585a7c666e67b7a6757bd12b734e22f4f76998a2 (diff) | |
| parent | 11d4c3f9b671720e80353dd7e433ff2bf65e9500 (diff) | |
| download | linux-07675f484bb9de0c4bd0722e174cb27043dbacef.tar.gz linux-07675f484bb9de0c4bd0722e174cb27043dbacef.tar.bz2 linux-07675f484bb9de0c4bd0722e174cb27043dbacef.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-32: Make sure the stack is set up before we use it
x86, mtrr: Avoid MTRR reprogramming on BP during boot on UP platforms
x86, nx: Don't force pages RW when setting NX bits
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/smp.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 4c2f63c7fc1b..1f4695136776 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -40,10 +40,7 @@ DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid); DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid); /* Static state in head.S used to set up a CPU */ -extern struct { - void *sp; - unsigned short ss; -} stack_start; +extern unsigned long stack_start; /* Initial stack pointer address */ struct smp_ops { void (*smp_prepare_boot_cpu)(void); |