diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /include/linux/mmzone.h | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/mmzone.h')
| -rw-r--r-- | include/linux/mmzone.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index ee9e3143df4f..2f1544e83042 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
| @@ -784,6 +784,18 @@ void sparse_init(void); | |||
| 784 | void memory_present(int nid, unsigned long start, unsigned long end); | 784 | void memory_present(int nid, unsigned long start, unsigned long end); |
| 785 | unsigned long __init node_memmap_size_bytes(int, unsigned long, unsigned long); | 785 | unsigned long __init node_memmap_size_bytes(int, unsigned long, unsigned long); |
| 786 | 786 | ||
| 787 | /* | ||
| 788 | * If it is possible to have holes within a MAX_ORDER_NR_PAGES, then we | ||
| 789 | * need to check pfn validility within that MAX_ORDER_NR_PAGES block. | ||
| 790 | * pfn_valid_within() should be used in this case; we optimise this away | ||
| 791 | * when we have no holes within a MAX_ORDER_NR_PAGES block. | ||
| 792 | */ | ||
| 793 | #ifdef CONFIG_HOLES_IN_ZONE | ||
| 794 | #define pfn_valid_within(pfn) pfn_valid(pfn) | ||
| 795 | #else | ||
| 796 | #define pfn_valid_within(pfn) (1) | ||
| 797 | #endif | ||
| 798 | |||
| 787 | #endif /* !__ASSEMBLY__ */ | 799 | #endif /* !__ASSEMBLY__ */ |
| 788 | #endif /* __KERNEL__ */ | 800 | #endif /* __KERNEL__ */ |
| 789 | #endif /* _LINUX_MMZONE_H */ | 801 | #endif /* _LINUX_MMZONE_H */ |