diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/pda.h | 6 | ||||
-rw-r--r-- | include/linux/mm.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-x86/pda.h b/include/asm-x86/pda.h index de2ad9ac35a9..b34e9a7cc80b 100644 --- a/include/asm-x86/pda.h +++ b/include/asm-x86/pda.h | |||
@@ -22,7 +22,8 @@ struct x8664_pda { | |||
22 | offset 40!!! */ | 22 | offset 40!!! */ |
23 | #endif | 23 | #endif |
24 | char *irqstackptr; | 24 | char *irqstackptr; |
25 | int nodenumber; /* number of current node */ | 25 | short nodenumber; /* number of current node (32k max) */ |
26 | short in_bootmem; /* pda lives in bootmem */ | ||
26 | unsigned int __softirq_pending; | 27 | unsigned int __softirq_pending; |
27 | unsigned int __nmi_count; /* number of NMI on this CPUs */ | 28 | unsigned int __nmi_count; /* number of NMI on this CPUs */ |
28 | short mmu_state; | 29 | short mmu_state; |
@@ -38,8 +39,7 @@ struct x8664_pda { | |||
38 | unsigned irq_spurious_count; | 39 | unsigned irq_spurious_count; |
39 | } ____cacheline_aligned_in_smp; | 40 | } ____cacheline_aligned_in_smp; |
40 | 41 | ||
41 | extern struct x8664_pda *_cpu_pda[]; | 42 | extern struct x8664_pda **_cpu_pda; |
42 | extern struct x8664_pda boot_cpu_pda[]; | ||
43 | extern void pda_init(int); | 43 | extern void pda_init(int); |
44 | 44 | ||
45 | #define cpu_pda(i) (_cpu_pda[i]) | 45 | #define cpu_pda(i) (_cpu_pda[i]) |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 586a943cab01..0ea48a5af823 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1024,6 +1024,7 @@ extern void mem_init(void); | |||
1024 | extern void show_mem(void); | 1024 | extern void show_mem(void); |
1025 | extern void si_meminfo(struct sysinfo * val); | 1025 | extern void si_meminfo(struct sysinfo * val); |
1026 | extern void si_meminfo_node(struct sysinfo *val, int nid); | 1026 | extern void si_meminfo_node(struct sysinfo *val, int nid); |
1027 | extern int after_bootmem; | ||
1027 | 1028 | ||
1028 | #ifdef CONFIG_NUMA | 1029 | #ifdef CONFIG_NUMA |
1029 | extern void setup_per_cpu_pageset(void); | 1030 | extern void setup_per_cpu_pageset(void); |