diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 20:04:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 20:04:18 -0400 |
| commit | 9e39264ed4f687251632c0a6f4a70c2e51719662 (patch) | |
| tree | 27651ca028328ac5e7b5a030312ad113b6cb8b2b /include | |
| parent | dc43d9fa73d82083656fb9c02f4823bcdcfb9f91 (diff) | |
| parent | 1e01979c8f502ac13e3cdece4f38712c5944e6e8 (diff) | |
Merge branch 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, numa: Implement pfn -> nid mapping granularity check
x86, mm: s/PAGES_PER_ELEMENT/PAGES_PER_SECTION/
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 9670f71d7be9..c70a326b8f26 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -1313,6 +1313,7 @@ extern void remove_active_range(unsigned int nid, unsigned long start_pfn, | |||
| 1313 | unsigned long end_pfn); | 1313 | unsigned long end_pfn); |
| 1314 | extern void remove_all_active_ranges(void); | 1314 | extern void remove_all_active_ranges(void); |
| 1315 | void sort_node_map(void); | 1315 | void sort_node_map(void); |
| 1316 | unsigned long node_map_pfn_alignment(void); | ||
| 1316 | unsigned long __absent_pages_in_range(int nid, unsigned long start_pfn, | 1317 | unsigned long __absent_pages_in_range(int nid, unsigned long start_pfn, |
| 1317 | unsigned long end_pfn); | 1318 | unsigned long end_pfn); |
| 1318 | extern unsigned long absent_pages_in_range(unsigned long start_pfn, | 1319 | extern unsigned long absent_pages_in_range(unsigned long start_pfn, |