x86: make 64 bit to use amd.c

arch/x86/kernel/cpu/amd.c is now 100% identical to
arch/x86/kernel/cpu/amd_64.c, so use amd.c on 64-bit too
and fix up the namespace impact.

Simplify the Kconfig glue as well.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 9 deletions

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 6156ac25ff8c..ab77d409fee0 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -444,17 +444,9 @@ config CPU_SUP_CYRIX_32
         help
           This enables extended support for Cyrix processors
 
-config CPU_SUP_AMD_32
+config CPU_SUP_AMD
         default y
         bool "Support AMD processors" if PROCESSOR_SELECT
-        depends on !64BIT
-        help
-          This enables extended support for AMD processors
-
-config CPU_SUP_AMD_64
-        default y
-        bool "Support AMD processors" if PROCESSOR_SELECT
-        depends on 64BIT
         help
           This enables extended support for AMD processors