diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-12 01:30:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 01:30:05 -0400 |
| commit | 1ba89386db0a3f39590b90b5dd20d7149ae52de0 (patch) | |
| tree | 7211f558d841cb40e1015d0b7527643ad55cb8e7 /arch/x86/kernel/trampoline.c | |
| parent | a26929fb489188ff959b1715ee67f0c9f84405b5 (diff) | |
| parent | ae94b8075a2ed58d2318ef03827b25bc844f844e (diff) | |
Merge branch 'x86/core' into x86/x2apic
Diffstat (limited to 'arch/x86/kernel/trampoline.c')
| -rw-r--r-- | arch/x86/kernel/trampoline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/trampoline.c b/arch/x86/kernel/trampoline.c index abbf199adebb..1106fac6024d 100644 --- a/arch/x86/kernel/trampoline.c +++ b/arch/x86/kernel/trampoline.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | #include <asm/trampoline.h> | 3 | #include <asm/trampoline.h> |
| 4 | 4 | ||
| 5 | /* ready for x86_64, no harm for x86, since it will overwrite after alloc */ | 5 | /* ready for x86_64 and x86 */ |
| 6 | unsigned char *trampoline_base = __va(TRAMPOLINE_BASE); | 6 | unsigned char *trampoline_base = __va(TRAMPOLINE_BASE); |
| 7 | 7 | ||
| 8 | /* | 8 | /* |