diff options
author | Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | 2009-03-14 12:24:02 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-14 16:27:29 +0100 |
commit | 48f4c485c275e9550fa1a1191768689cc3ae0037 (patch) | |
tree | c50cbbcc959e5bb2c84d3c0d9cd9fbb33dea41a8 /arch/x86/Kconfig.cpu | |
parent | 0ca0f16fd17c5d880dd0abbe03595b0c7c5b3c95 (diff) | |
download | linux-stable-48f4c485c275e9550fa1a1191768689cc3ae0037.tar.gz linux-stable-48f4c485c275e9550fa1a1191768689cc3ae0037.tar.bz2 linux-stable-48f4c485c275e9550fa1a1191768689cc3ae0037.zip |
x86/centaur: merge 32 & 64 bit version
there should be no difference, except:
* the 64bit variant now also initializes the padlock unit.
* ->c_early_init() is executed again from ->c_init()
* the 64bit fixups made into 32bit path.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: herbert@gondor.apana.org.au
LKML-Reference: <1237029843-28076-2-git-send-email-sebastian@breakpoint.cc>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig.cpu')
-rw-r--r-- | arch/x86/Kconfig.cpu | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index a95eaf0e582a..924e156a85ab 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -456,24 +456,9 @@ config CPU_SUP_AMD If unsure, say N. -config CPU_SUP_CENTAUR_32 +config CPU_SUP_CENTAUR default y bool "Support Centaur processors" if PROCESSOR_SELECT - depends on !64BIT - ---help--- - This enables detection, tunings and quirks for Centaur processors - - You need this enabled if you want your kernel to run on a - Centaur CPU. Disabling this option on other types of CPUs - makes the kernel a tiny bit smaller. Disabling it on a Centaur - CPU might render the kernel unbootable. - - If unsure, say N. - -config CPU_SUP_CENTAUR_64 - default y - bool "Support Centaur processors" if PROCESSOR_SELECT - depends on 64BIT ---help--- This enables detection, tunings and quirks for Centaur processors |