git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core/percpu' into perfcounters/core
[safe/jmp/linux-2.6]
/
arch
/
x86
/
include
/
asm
/
trampoline.h
diff --git
a/arch/x86/include/asm/trampoline.h
b/arch/x86/include/asm/trampoline.h
index
780ba0a
..
90f06c2
100644
(file)
--- a/
arch/x86/include/asm/trampoline.h
+++ b/
arch/x86/include/asm/trampoline.h
@@
-13,6
+13,7
@@
extern unsigned char *trampoline_base;
extern unsigned long init_rsp;
extern unsigned long initial_code;
+extern unsigned long initial_gs;
#define TRAMPOLINE_SIZE roundup(trampoline_end - trampoline_data, PAGE_SIZE)
#define TRAMPOLINE_BASE 0x6000