diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /include/linux/hugetlb.h | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
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 */ |