git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
trampoline.c
diff --git
a/arch/x86/kernel/trampoline.c
b/arch/x86/kernel/trampoline.c
index
abbf199
..
1106fac
100644
(file)
--- a/
arch/x86/kernel/trampoline.c
+++ b/
arch/x86/kernel/trampoline.c
@@
-2,7
+2,7
@@
#include <asm/trampoline.h>
-/* ready for x86_64
, no harm for x86, since it will overwrite after alloc
*/
+/* ready for x86_64
and x86
*/
unsigned char *trampoline_base = __va(TRAMPOLINE_BASE);
/*