summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/trampoline.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-11 12:49:34 +0300
committerIngo Molnar <mingo@elte.hu>2009-03-11 12:49:34 +0300
commitd95c3578120e5bc4784069439f00ccb1b5f87717 (patch)
treec819de31de3983f3d69f223ede07667ff23bf7da /arch/x86/include/asm/trampoline.h
parentba1d755a36f66101aa88ac9ebb54694def6ec38d (diff)
parent78b020d035074fc3aa4d017353bb2c32e2aff56f (diff)
downloadlinux-d95c3578120e5bc4784069439f00ccb1b5f87717.tar.xz
Merge branch 'x86/core' into cpus4096
Diffstat (limited to 'arch/x86/include/asm/trampoline.h')
-rw-r--r--arch/x86/include/asm/trampoline.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/trampoline.h b/arch/x86/include/asm/trampoline.h
index 780ba0ab94f9..90f06c25221d 100644
--- 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