Prev: [PATCH] MAINTAINERS: update mail address
Next: DMAENGINE: driver for the ARM PL080/PL081 PrimeCells
From: Naoya Horiguchi on 15 Jun 2010 00:30
Hi Andi-san,

Andrew and Mel gave me an improvement.
Could you put this patch on top of hwpoison branch in your tree?

Thanks,
Naoya Horiguchi
---
CONFIG_HUGETLBFS controls hugetlbfs interface code.
OTOH, CONFIG_HUGETLB_PAGE controls hugepage management code.
So we should use CONFIG_HUGETLB_PAGE here.

Signed-off-by: Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
---
include/linux/hugetlb_inline.h | 4 ++--
mm/rmap.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/linux/hugetlb_inline.h b/include/linux/hugetlb_inline.h
index cf00b6d..6931489 100644
--- a/include/linux/hugetlb_inline.h
+++ b/include/linux/hugetlb_inline.h
@@ -1,7 +1,7 @@
#ifndef _LINUX_HUGETLB_INLINE_H
-#define _LINUX_HUGETLB_INLINE_H 1
+#define _LINUX_HUGETLB_INLINE_H

-#ifdef CONFIG_HUGETLBFS
+#ifdef CONFIG_HUGETLB_PAGE

#include <linux/mm.h>

diff --git a/mm/rmap.c b/mm/rmap.c
index 0ad5357..71bd30a 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1462,7 +1462,7 @@ int rmap_walk(struct page *page, int (*rmap_one)(struct page *,
}
#endif /* CONFIG_MIGRATION */

-#ifdef CONFIG_HUGETLBFS
+#ifdef CONFIG_HUGETLB_PAGE
/*
* The following three functions are for anonymous (private mapped) hugepages.
* Unlike common anonymous pages, anonymous hugepages have no accounting code
@@ -1503,4 +1503,4 @@ void hugepage_add_new_anon_rmap(struct page *page,
atomic_set(&page->_mapcount, 0);
__hugepage_set_anon_rmap(page, vma, address, 1);
}
-#endif /* CONFIG_HUGETLBFS */
+#endif /* CONFIG_HUGETLB_PAGE */
--
1.7.0.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH] MAINTAINERS: update mail address
Next: DMAENGINE: driver for the ARM PL080/PL081 PrimeCells