---

yaml --- r: 65500 b: refs/heads/master c: e0a84f6 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 24af9a4 · 24af9a4
1 parent 66502c3
commit 24af9a4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 977d5654cb630d6845b84a984fb5698e839f20f2
+refs/heads/master: e0a84f689b4373cbaa6d3a5bc5c52a613005fed1
diff --git a/trunk/arch/x86_64/boot/compressed/head.S b/trunk/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/trunk/arch/x86_64/kernel/acpi/wakeup.S b/trunk/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/trunk/arch/x86_64/kernel/trampoline_64.S b/trunk/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/trunk/arch/x86_64/kernel/verify_cpu.S → trunk/arch/x86_64/kernel/verify_cpu_64.S b/trunk/arch/x86_64/kernel/verify_cpu.S → trunk/arch/x86_64/kernel/verify_cpu_64.S