diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 18:53:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 18:53:02 -0800 |
commit | 3108864e2d70891d30d60af6af256a1b517d7078 (patch) | |
tree | f127ddaf0b582098caf7f9e3ed18ed535324eae4 /arch/x86/include | |
parent | 4f7dbc7ff4ec19b40ec083f7c54a87d3ece0089d (diff) | |
parent | 604d20554883cf03f888440d58ea7c6d36899839 (diff) | |
download | linux-3108864e2d70891d30d60af6af256a1b517d7078.tar.gz linux-3108864e2d70891d30d60af6af256a1b517d7078.tar.bz2 linux-3108864e2d70891d30d60af6af256a1b517d7078.zip |
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) extern int early_pfn_to_nid(unsigned long pfn); +extern void resume_map_numa_kva(pgd_t *pgd); + #else /* !CONFIG_NUMA */ #define get_memcfg_numa get_memcfg_numa_flat +static inline void resume_map_numa_kva(pgd_t *pgd) {} + #endif /* CONFIG_NUMA */ #ifdef CONFIG_DISCONTIGMEM |