Skip to content

Commit

Permalink
x86, cpu: Rename verify_cpu_64.S to verify_cpu.S
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kees Cook authored and H. Peter Anvin committed Nov 10, 2010
1 parent c8ddb27 commit c5cbac6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/x86/boot/compressed/head_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ no_longmode:
hlt
jmp 1b

#include "../../kernel/verify_cpu_64.S"
#include "../../kernel/verify_cpu.S"

/*
* Be careful here startup_64 needs to be at a predictable
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/trampoline_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ startup_64:
no_longmode:
hlt
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;
tidt:
Expand Down
File renamed without changes.

0 comments on commit c5cbac6

Please sign in to comment.