diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /arch/x86/include/asm/mmzone_32.h | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'arch/x86/include/asm/mmzone_32.h')
| -rw-r--r-- | arch/x86/include/asm/mmzone_32.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index 07f1af494ca5..105fb90a0635 100644 --- a/arch/x86/include/asm/mmzone_32.h +++ b/arch/x86/include/asm/mmzone_32.h | |||
| @@ -32,8 +32,6 @@ static inline void get_memcfg_numa(void) | |||
| 32 | get_memcfg_numa_flat(); | 32 | get_memcfg_numa_flat(); |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | extern int early_pfn_to_nid(unsigned long pfn); | ||
| 36 | |||
| 37 | extern void resume_map_numa_kva(pgd_t *pgd); | 35 | extern void resume_map_numa_kva(pgd_t *pgd); |
| 38 | 36 | ||
| 39 | #else /* !CONFIG_NUMA */ | 37 | #else /* !CONFIG_NUMA */ |