Merge branch 'core/percpu' into stackprotector

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / pda.h

diff --git a/arch/x86/include/asm/pda.h b/arch/x86/include/asm/pda.h
index c31ca048a901f71c585bfce5032541731847ffa6..5976cd803e9a2609acfbb1ff36b9576fa4af98ec 100644 (file)
--- a/arch/x86/include/asm/pda.h
+++ b/arch/x86/include/asm/pda.h
@@ -17,11 +17,9 @@ struct x8664_pda {
        unsigned long unused4;
        int unused5;
        unsigned int unused6;           /* 36 was cpunumber */
-#ifdef CONFIG_CC_STACKPROTECTOR
        unsigned long stack_canary;     /* 40 stack canary value */
                                        /* gcc-ABI: this canary MUST be at
                                           offset 40!!! */
-#endif
        short in_bootmem;               /* pda lives in bootmem */
 } ____cacheline_aligned_in_smp;
 
@@ -42,4 +40,6 @@ extern void pda_init(int);
 
 #endif
 
+#define refresh_stack_canary() write_pda(stack_canary, current->stack_canary)
+
 #endif /* _ASM_X86_PDA_H */