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>

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