diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-06 08:23:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-06 08:23:39 -0400 |
| commit | 68083e05d72d94f347293d8cc0067050ba904bfa (patch) | |
| tree | 842e71365bd90866be7add181661a4039d891564 /arch/x86/kernel/head_64.S | |
| parent | 7baac8b91f9871ba8cb09af84de4ae1d86d07812 (diff) | |
| parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) | |
Merge commit 'v2.6.26-rc9' into cpus4096
Diffstat (limited to 'arch/x86/kernel/head_64.S')
| -rw-r--r-- | arch/x86/kernel/head_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 10a1955bb1d1..b817974ef942 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
| @@ -128,7 +128,7 @@ ident_complete: | |||
| 128 | /* Fixup phys_base */ | 128 | /* Fixup phys_base */ |
| 129 | addq %rbp, phys_base(%rip) | 129 | addq %rbp, phys_base(%rip) |
| 130 | 130 | ||
| 131 | #ifdef CONFIG_SMP | 131 | #ifdef CONFIG_X86_TRAMPOLINE |
| 132 | addq %rbp, trampoline_level4_pgt + 0(%rip) | 132 | addq %rbp, trampoline_level4_pgt + 0(%rip) |
| 133 | addq %rbp, trampoline_level4_pgt + (511*8)(%rip) | 133 | addq %rbp, trampoline_level4_pgt + (511*8)(%rip) |
| 134 | #endif | 134 | #endif |