diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 13:34:54 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 13:34:54 -0400 |
| commit | 8eb2c0ee67f4853c0e433394f65ef8143a748c80 (patch) | |
| tree | ea74ea0878b2f07eb70f2d5b42be5ec42f3bdb5f /arch/x86/include/asm/mmzone_64.h | |
| parent | 3e0dc6b01f5301d63046f6deddde2c7f5c57d67a (diff) | |
| parent | 0d72c6fcb5cd215eeab824fac216ea42c5b574aa (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/x86/include/asm/mmzone_64.h')
| -rw-r--r-- | arch/x86/include/asm/mmzone_64.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/mmzone_64.h b/arch/x86/include/asm/mmzone_64.h index b3f88d7867c7..129d9aa3ceb3 100644 --- a/arch/x86/include/asm/mmzone_64.h +++ b/arch/x86/include/asm/mmzone_64.h | |||
| @@ -13,8 +13,5 @@ extern struct pglist_data *node_data[]; | |||
| 13 | 13 | ||
| 14 | #define NODE_DATA(nid) (node_data[nid]) | 14 | #define NODE_DATA(nid) (node_data[nid]) |
| 15 | 15 | ||
| 16 | #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) | ||
| 17 | #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ | ||
| 18 | NODE_DATA(nid)->node_spanned_pages) | ||
| 19 | #endif | 16 | #endif |
| 20 | #endif /* _ASM_X86_MMZONE_64_H */ | 17 | #endif /* _ASM_X86_MMZONE_64_H */ |