Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[karo-tx-linux.git] / arch / x86 / include / asm / unwind.h

diff --git a/arch/x86/include/asm/unwind.h b/arch/x86/include/asm/unwind.h
index 137e9cce2ab4d019f9db877472adee37e36009e5..e6676495b1259c9462723a3a8971bb61f5b4f86b 100644 (file)
--- a/arch/x86/include/asm/unwind.h
+++ b/arch/x86/include/asm/unwind.h
@@ -13,8 +13,10 @@ struct unwind_state {
        int graph_idx;
        bool error;
 #ifdef CONFIG_FRAME_POINTER
+       bool got_irq;
        unsigned long *bp, *orig_sp;
        struct pt_regs *regs;
+       unsigned long ip;
 #else
        unsigned long *sp;
 #endif