x86_64: prepare shared kernel/verify_cpu.S

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86_64/boot/compressed/head.S b/arch/x86_64/boot/compressed/head.S
index 9fd8030cc54ff2e48b05004ddf34e577fb494a85..49467640751fc0eb0a67c96ca7e9fa0b3d973fb0 100644 (file)
--- a/arch/x86_64/boot/compressed/head.S
+++ b/arch/x86_64/boot/compressed/head.S
@@ -174,7 +174,7 @@ no_longmode:
        hlt
        jmp     1b
 
-#include "../../kernel/verify_cpu.S"
+#include "../../kernel/verify_cpu_64.S"
 
        /* Be careful here startup_64 needs to be at a predictable
         * address so I can export it in an ELF header.  Bootloaders

diff --git a/arch/x86_64/kernel/acpi/wakeup.S b/arch/x86_64/kernel/acpi/wakeup.S
index a06f2bcabef9d5f3cfe0928c31d0b753894d6aca..8b4357e1efe0b97dc37b24e5d4cc66321ecfc0cb 100644 (file)
--- a/arch/x86_64/kernel/acpi/wakeup.S
+++ b/arch/x86_64/kernel/acpi/wakeup.S
@@ -269,7 +269,7 @@ no_longmode:
        movb    $0xbc,%al       ;  outb %al,$0x80
        jmp no_longmode
 
-#include "../verify_cpu.S"
+#include "../verify_cpu_64.S"
        
 /* This code uses an extended set of video mode numbers. These include:
  * Aliases for standard modes

diff --git a/arch/x86_64/kernel/trampoline_64.S b/arch/x86_64/kernel/trampoline_64.S
index e7e2764c461b682eb1b7bf42be76fd137e88efc8..607983b0d27b9a5fd1b07d8e4beb41e7516417f1 100644 (file)
--- a/arch/x86_64/kernel/trampoline_64.S
+++ b/arch/x86_64/kernel/trampoline_64.S
@@ -126,7 +126,7 @@ startup_64:
 no_longmode:
        hlt
        jmp no_longmode
-#include "verify_cpu.S"
+#include "verify_cpu_64.S"
 
        # Careful these need to be in the same 64K segment as the above;
 tidt:

diff --git a/arch/x86_64/kernel/verify_cpu.S b/arch/x86_64/kernel/verify_cpu_64.S
similarity index 100%
rename from arch/x86_64/kernel/verify_cpu.S
rename to arch/x86_64/kernel/verify_cpu_64.S