diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:15:19 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:15:19 +0200 |
| commit | e0a84f689b4373cbaa6d3a5bc5c52a613005fed1 (patch) | |
| tree | 564abd5e706e86fca05ece1a058295355f61cd7e /arch/x86_64 | |
| parent | x86_64: prepare shared kernel/head.S (diff) | |
| download | linux-dev-e0a84f689b4373cbaa6d3a5bc5c52a613005fed1.tar.xz linux-dev-e0a84f689b4373cbaa6d3a5bc5c52a613005fed1.zip | |
x86_64: prepare shared kernel/verify_cpu.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86_64/boot/compressed/head.S | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/acpi/wakeup.S | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/trampoline_64.S | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/verify_cpu_64.S (renamed from arch/x86_64/kernel/verify_cpu.S) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/boot/compressed/head.S b/arch/x86_64/boot/compressed/head.S index 9fd8030cc54f..49467640751f 100644 --- 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 a06f2bcabef9..8b4357e1efe0 100644 --- 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 e7e2764c461b..607983b0d27b 100644 --- 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 index 45b6f8a975a1..45b6f8a975a1 100644 --- a/arch/x86_64/kernel/verify_cpu.S +++ b/arch/x86_64/kernel/verify_cpu_64.S |