| commit | a1716d508abf77e4bd02c275ab9293b9866929f3 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Jul 05 08:42:45 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Jul 05 08:42:45 2008 +0200 |
| tree | 57195a0cfc8bdc353f163a8b3b53c8d99c2562e8 | |
| parent | 64e83b5a919a65eb35b63dd7e07c188379ff8ce6 [diff] | |
| parent | 4b4f7280d7fd1feeff134c2cf2db32fd583b6c29 [diff] |
Merge branch 'x86/s2ram-fix' into x86/urgent
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 10a1955..b817974 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S
@@ -128,7 +128,7 @@ /* Fixup phys_base */ addq %rbp, phys_base(%rip) -#ifdef CONFIG_SMP +#ifdef CONFIG_X86_TRAMPOLINE addq %rbp, trampoline_level4_pgt + 0(%rip) addq %rbp, trampoline_level4_pgt + (511*8)(%rip) #endif