diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /include/linux/hugetlb.h | |
parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/hugetlb.h')
-rw-r--r-- | include/linux/hugetlb.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 9a71d4cc88c8..32e0ef0f6e1f 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h | |||
@@ -273,7 +273,10 @@ struct hstate {}; | |||
273 | #define huge_page_mask(h) PAGE_MASK | 273 | #define huge_page_mask(h) PAGE_MASK |
274 | #define huge_page_order(h) 0 | 274 | #define huge_page_order(h) 0 |
275 | #define huge_page_shift(h) PAGE_SHIFT | 275 | #define huge_page_shift(h) PAGE_SHIFT |
276 | #define pages_per_huge_page(h) 1 | 276 | static inline unsigned int pages_per_huge_page(struct hstate *h) |
277 | { | ||
278 | return 1; | ||
279 | } | ||
277 | #endif | 280 | #endif |
278 | 281 | ||
279 | #endif /* _LINUX_HUGETLB_H */ | 282 | #endif /* _LINUX_HUGETLB_H */ |