diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:15:19 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:15:19 -0400 |
commit | e0a84f689b4373cbaa6d3a5bc5c52a613005fed1 (patch) | |
tree | 564abd5e706e86fca05ece1a058295355f61cd7e /arch/x86_64/kernel | |
parent | 977d5654cb630d6845b84a984fb5698e839f20f2 (diff) |
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 'arch/x86_64/kernel')
-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 |
3 files changed, 2 insertions, 2 deletions
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: | |||
269 | movb $0xbc,%al ; outb %al,$0x80 | 269 | movb $0xbc,%al ; outb %al,$0x80 |
270 | jmp no_longmode | 270 | jmp no_longmode |
271 | 271 | ||
272 | #include "../verify_cpu.S" | 272 | #include "../verify_cpu_64.S" |
273 | 273 | ||
274 | /* This code uses an extended set of video mode numbers. These include: | 274 | /* This code uses an extended set of video mode numbers. These include: |
275 | * Aliases for standard modes | 275 | * 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: | |||
126 | no_longmode: | 126 | no_longmode: |
127 | hlt | 127 | hlt |
128 | jmp no_longmode | 128 | jmp no_longmode |
129 | #include "verify_cpu.S" | 129 | #include "verify_cpu_64.S" |
130 | 130 | ||
131 | # Careful these need to be in the same 64K segment as the above; | 131 | # Careful these need to be in the same 64K segment as the above; |
132 | tidt: | 132 | 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 | |||