[PATCH] x86_64: Don't confuse noapic with noapictimer

[safe/jmp/linux-2.6] / arch / x86_64 / kernel / asm-offsets.c

diff --git a/arch/x86_64/kernel/asm-offsets.c b/arch/x86_64/kernel/asm-offsets.c
index 35b4c3f..cfb4f9c 100644 (file)
--- a/arch/x86_64/kernel/asm-offsets.c
+++ b/arch/x86_64/kernel/asm-offsets.c
@@ -33,13 +33,13 @@ int main(void)
        ENTRY(flags);
        ENTRY(addr_limit);
        ENTRY(preempt_count);
+       ENTRY(status);
        BLANK();
 #undef ENTRY
 #define ENTRY(entry) DEFINE(pda_ ## entry, offsetof(struct x8664_pda, entry))
        ENTRY(kernelstack); 
        ENTRY(oldrsp); 
        ENTRY(pcurrent); 
-       ENTRY(irqrsp);
        ENTRY(irqcount);
        ENTRY(cpunumber);
        ENTRY(irqstackptr);
@@ -65,5 +65,9 @@ int main(void)
        DEFINE(pbe_address, offsetof(struct pbe, address));
        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
        return 0;
 }