diff options
| author | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> | 2010-06-15 13:18:13 +0900 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2010-08-11 09:23:22 +0200 |
| commit | e3390f67a7267daa227380b6f1bbf13c7ddd4aff (patch) | |
| tree | 7f0285b20cc844b9ea403d5d1278a9643a1baec5 | |
| parent | 43131e141abdb44c487cf79af3ef1fe5164dcef9 (diff) | |
| download | talos-op-linux-e3390f67a7267daa227380b6f1bbf13c7ddd4aff.tar.gz talos-op-linux-e3390f67a7267daa227380b6f1bbf13c7ddd4aff.zip | |
hwpoison: rename CONFIG
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@ah.jp.nec.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
| -rw-r--r-- | include/linux/hugetlb_inline.h | 4 | ||||
| -rw-r--r-- | 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 cf00b6df53dc..6931489a5c14 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 0ad53572eaf2..71bd30a147cf 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 */ |
