浏览代码

x86, cpu: Rename verify_cpu_64.S to verify_cpu.S

The code is 32bit already, and can be used in 32bit routines.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
LKML-Reference: <1289414154-7829-2-git-send-email-kees.cook@canonical.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Kees Cook 14 年之前
父节点
当前提交
c5cbac6942
共有 3 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      arch/x86/boot/compressed/head_64.S
  2. 1 1
      arch/x86/kernel/trampoline_64.S
  3. 0 0
      arch/x86/kernel/verify_cpu.S

+ 1 - 1
arch/x86/boot/compressed/head_64.S

@@ -182,7 +182,7 @@ no_longmode:
 	hlt
 	hlt
 	jmp     1b
 	jmp     1b
 
 
-#include "../../kernel/verify_cpu_64.S"
+#include "../../kernel/verify_cpu.S"
 
 
 	/*
 	/*
 	 * Be careful here startup_64 needs to be at a predictable
 	 * Be careful here startup_64 needs to be at a predictable

+ 1 - 1
arch/x86/kernel/trampoline_64.S

@@ -127,7 +127,7 @@ startup_64:
 no_longmode:
 no_longmode:
 	hlt
 	hlt
 	jmp no_longmode
 	jmp no_longmode
-#include "verify_cpu_64.S"
+#include "verify_cpu.S"
 
 
 	# Careful these need to be in the same 64K segment as the above;
 	# Careful these need to be in the same 64K segment as the above;
 tidt:
 tidt:

+ 0 - 0
arch/x86/kernel/verify_cpu_64.S → arch/x86/kernel/verify_cpu.S