diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-25 15:50:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-25 15:50:32 -0700 |
| commit | a0c1af135a93ee25b07cbc61762fb957fd2f3733 (patch) | |
| tree | e1a9421514b570d2fbb7138afa618e9a02e582eb /arch/x86/kernel/cpu/common.c | |
| parent | 93c32483808c5d82c9bd1eef2208854a6d1326db (diff) | |
| parent | 71c9d8b68b299bef614afc7907393564a9f1476f (diff) | |
| download | kernel_replicant_linux-a0c1af135a93ee25b07cbc61762fb957fd2f3733.tar.gz kernel_replicant_linux-a0c1af135a93ee25b07cbc61762fb957fd2f3733.tar.bz2 kernel_replicant_linux-a0c1af135a93ee25b07cbc61762fb957fd2f3733.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: Remove remap percpu allocator for the time being
x86: cpa_flush_array wbinvd should be done on all CPUs
x86: bugfix wbinvd() model check instead of family check
x86: introduce noxsave boot parameter
x86, setup: revert ACPI 3 E820 extended attributes support
x86: DMI match for the Sony VGN-Z540N as it needs BIOS reboot
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index c1caefc82e62..77848d9fca68 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -114,6 +114,13 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { } }; EXPORT_PER_CPU_SYMBOL_GPL(gdt_page); +static int __init x86_xsave_setup(char *s) +{ + setup_clear_cpu_cap(X86_FEATURE_XSAVE); + return 1; +} +__setup("noxsave", x86_xsave_setup); + #ifdef CONFIG_X86_32 static int cachesize_override __cpuinitdata = -1; static int disable_x86_serial_nr __cpuinitdata = 1; |