diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-09 10:42:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-09 10:42:21 +0100 |
| commit | 4385428a477559b26736cc3c80d8b68f31126c71 (patch) | |
| tree | 8eb0cbc78e79c368687fa13a1e0674ae537f830f /arch/x86/kernel/trampoline_64.S | |
| parent | 047a3772feaae8e43d81d790f3d3f80dae8ae676 (diff) | |
| parent | 2d75af2f2a7a6103a6d539a492fe81deacabde44 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'arch/x86/kernel/trampoline_64.S')
| -rw-r--r-- | arch/x86/kernel/trampoline_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S index 3af2dff58b2..075d130efcf 100644 --- a/arch/x86/kernel/trampoline_64.S +++ b/arch/x86/kernel/trampoline_64.S @@ -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: |