summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Righi2008-07-27 00:22:27 +0200
committerLinus Torvalds2008-07-27 05:16:47 +0200
commit510a35d4a47802f4a0028aa6bd2ca2170da5e32f (patch)
tree8eb0d6091fe89f013436c5080dc4cbaf825172cf
parenttask IO accounting: correctly account threads IO statistics (diff)
downloadkernel-qcow2-linux-510a35d4a47802f4a0028aa6bd2ca2170da5e32f.tar.gz
kernel-qcow2-linux-510a35d4a47802f4a0028aa6bd2ca2170da5e32f.tar.xz
kernel-qcow2-linux-510a35d4a47802f4a0028aa6bd2ca2170da5e32f.zip
hugetlb: remove unused variable warning
Remove the following warning when CONFIG_HUGETLB_PAGE is not set: ipc/shm.c: In function `shm_get_stat': ipc/shm.c:565: warning: unused variable `h' [akpm@linux-foundation.org: use tabs, not spaces] Signed-off-by: Andrea Righi <righi.andrea@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/hugetlb.h5
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 {};
#define huge_page_mask(h) PAGE_MASK
#define huge_page_order(h) 0
#define huge_page_shift(h) PAGE_SHIFT
-#define pages_per_huge_page(h) 1
+static inline unsigned int pages_per_huge_page(struct hstate *h)
+{
+ return 1;
+}
#endif
#endif /* _LINUX_HUGETLB_H */