summaryrefslogtreecommitdiff
path: root/arch/x86_64/kernel/asm-offsets.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-16 01:56:39 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-16 11:27:58 -0800
commit5f8efbb96f4b2679dcbd2c115380a47bd2089dcd (patch)
tree09b8c0684ee8e943d6199e2e4ebc21e5ce0062c9 /arch/x86_64/kernel/asm-offsets.c
parentaa41eb9915de74fc6935792973bac4bd777ce218 (diff)
downloadlwn-5f8efbb96f4b2679dcbd2c115380a47bd2089dcd.tar.gz
lwn-5f8efbb96f4b2679dcbd2c115380a47bd2089dcd.zip
[PATCH] x86_64: Allow nesting of int3 by default for kprobes
This unbreaks recursive kprobes which didn't work anymore due to an earlier patch which converted the debug entry point to use an IST. This also allows nesting of the debug entry point too. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/asm-offsets.c')
-rw-r--r--arch/x86_64/kernel/asm-offsets.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/asm-offsets.c b/arch/x86_64/kernel/asm-offsets.c
index cfb4f9cebea4..38834bbbae11 100644
--- a/arch/x86_64/kernel/asm-offsets.c
+++ b/arch/x86_64/kernel/asm-offsets.c
@@ -43,6 +43,7 @@ int main(void)
ENTRY(irqcount);
ENTRY(cpunumber);
ENTRY(irqstackptr);
+ ENTRY(data_offset);
BLANK();
#undef ENTRY
#ifdef CONFIG_IA32_EMULATION
@@ -66,8 +67,6 @@ int main(void)
DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address));
DEFINE(pbe_next, offsetof(struct pbe, next));
BLANK();
-#if DEBUG_STKSZ > EXCEPTION_STKSZ
- DEFINE(DEBUG_IST, DEBUG_STACK);
-#endif
+ DEFINE(TSS_ist, offsetof(struct tss_struct, ist));
return 0;
}