Merge branch 'linus' into stackprotector

[~andy/linux] / include / asm-x86 / pda.h

diff --git a/include/asm-x86/pda.h b/include/asm-x86/pda.h
index a5ff5bb762995849eae3acb219365834353aa96f..45fd2aee8d6a7306f5967ef84d378c79f29ca6d8 100644 (file)
--- a/include/asm-x86/pda.h
+++ b/include/asm-x86/pda.h
@@ -1,5 +1,5 @@
-#ifndef X86_64_PDA_H
-#define X86_64_PDA_H
+#ifndef ASM_X86__PDA_H
+#define ASM_X86__PDA_H
 
 #ifndef __ASSEMBLY__
 #include <linux/stddef.h>
@@ -20,6 +20,8 @@ struct x8664_pda {
                                        /* gcc-ABI: this canary MUST be at
                                           offset 40!!! */
        char *irqstackptr;
+       short nodenumber;               /* number of current node (32k max) */
+       short in_bootmem;               /* pda lives in bootmem */
        unsigned int __softirq_pending;
        unsigned int __nmi_count;       /* number of NMI on this CPUs */
        short mmu_state;
@@ -35,8 +37,7 @@ struct x8664_pda {
        unsigned irq_spurious_count;
 } ____cacheline_aligned_in_smp;
 
-extern struct x8664_pda *_cpu_pda[];
-extern struct x8664_pda boot_cpu_pda[];
+extern struct x8664_pda **_cpu_pda;
 extern void pda_init(int);
 
 #define cpu_pda(i) (_cpu_pda[i])
@@ -132,4 +133,5 @@ do {                                                                        \
 #define PDA_STACKOFFSET (5*8)
 
 #define refresh_stack_canary() write_pda(stack_canary, current->stack_canary)
-#endif
+
+#endif /* ASM_X86__PDA_H */