diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 07:30:37 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:37 -0500 |
commit | 8a423ff0c4a0472607bbed6790fdaeec54af2ebb (patch) | |
tree | 676fab07c33482e2b81cd1596c206c9b5b0c0b1b /include/asm-x86/mmzone_64.h | |
parent | 4757d7d8d00c5f8b2c176ca03b0a8eabbc206664 (diff) |
x86: merge include/asm-x86/sparsemem.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/mmzone_64.h')
-rw-r--r-- | include/asm-x86/mmzone_64.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/mmzone_64.h b/include/asm-x86/mmzone_64.h index 19a89377b123..1e0ed34a6adc 100644 --- a/include/asm-x86/mmzone_64.h +++ b/include/asm-x86/mmzone_64.h | |||
@@ -41,6 +41,8 @@ static inline __attribute__((pure)) int phys_to_nid(unsigned long addr) | |||
41 | #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ | 41 | #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ |
42 | NODE_DATA(nid)->node_spanned_pages) | 42 | NODE_DATA(nid)->node_spanned_pages) |
43 | 43 | ||
44 | extern int early_pfn_to_nid(unsigned long pfn); | ||
45 | |||
44 | #ifdef CONFIG_DISCONTIGMEM | 46 | #ifdef CONFIG_DISCONTIGMEM |
45 | #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT) | 47 | #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT) |
46 | 48 | ||