x86: unify arch/x86/kernel/Makefile(s)

Combine the 32 and 64 bit specific Makefiles in one file.
While doing so link order was (almost) preserved on 32 bit
but on 64 bit link order changed a lot.

Patch was checked with defconfig + allyesconfig builds.
The same .o files were linked in these configurations.

To keep readability of the Makefiles a few Kconfig
symbols was added/modified and it was checked that
they were not used anywhere else.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 9 insertions, 1 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fa6fa52248d9..3d2c8dfba915 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -129,9 +129,17 @@ config GENERIC_PENDING_IRQ
 
 config X86_SMP
         bool
-        depends on X86_32 && SMP && !X86_VOYAGER
+        depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
         default y
 
+config X86_32_SMP
+        def_bool y
+        depends on X86_32 && SMP
+
+config X86_64_SMP
+        def_bool y
+        depends on X86_64 && SMP
+
 config X86_HT
         bool
         depends on SMP