diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 21:53:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 21:53:02 -0500 |
| commit | 3108864e2d70891d30d60af6af256a1b517d7078 (patch) | |
| tree | f127ddaf0b582098caf7f9e3ed18ed535324eae4 /arch/x86/include | |
| parent | 4f7dbc7ff4ec19b40ec083f7c54a87d3ece0089d (diff) | |
| parent | 604d20554883cf03f888440d58ea7c6d36899839 (diff) | |
Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: make NUMA on 32-bit depend on EXPERIMENTAL again
x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mmzone_32.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index 485bdf059ffb..07f1af494ca5 100644 --- a/arch/x86/include/asm/mmzone_32.h +++ b/arch/x86/include/asm/mmzone_32.h | |||
| @@ -34,10 +34,14 @@ static inline void get_memcfg_numa(void) | |||
| 34 | 34 | ||
| 35 | extern int early_pfn_to_nid(unsigned long pfn); | 35 | extern int early_pfn_to_nid(unsigned long pfn); |
| 36 | 36 | ||
| 37 | extern void resume_map_numa_kva(pgd_t *pgd); | ||
| 38 | |||
| 37 | #else /* !CONFIG_NUMA */ | 39 | #else /* !CONFIG_NUMA */ |
| 38 | 40 | ||
| 39 | #define get_memcfg_numa get_memcfg_numa_flat | 41 | #define get_memcfg_numa get_memcfg_numa_flat |
| 40 | 42 | ||
| 43 | static inline void resume_map_numa_kva(pgd_t *pgd) {} | ||
| 44 | |||
| 41 | #endif /* CONFIG_NUMA */ | 45 | #endif /* CONFIG_NUMA */ |
| 42 | 46 | ||
| 43 | #ifdef CONFIG_DISCONTIGMEM | 47 | #ifdef CONFIG_DISCONTIGMEM |