aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>2010-06-15 00:18:13 -0400
committerAndi Kleen <ak@linux.intel.com>2010-08-11 03:23:22 -0400
commite3390f67a7267daa227380b6f1bbf13c7ddd4aff (patch)
tree7f0285b20cc844b9ea403d5d1278a9643a1baec5
parent43131e141abdb44c487cf79af3ef1fe5164dcef9 (diff)
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.h4
-rw-r--r--mm/rmap.c4
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 @@
1#ifndef _LINUX_HUGETLB_INLINE_H 1#ifndef _LINUX_HUGETLB_INLINE_H
2#define _LINUX_HUGETLB_INLINE_H 1 2#define _LINUX_HUGETLB_INLINE_H
3 3
4#ifdef CONFIG_HUGETLBFS 4#ifdef CONFIG_HUGETLB_PAGE
5 5
6#include <linux/mm.h> 6#include <linux/mm.h>
7 7
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 *,
1462} 1462}
1463#endif /* CONFIG_MIGRATION */ 1463#endif /* CONFIG_MIGRATION */
1464 1464
1465#ifdef CONFIG_HUGETLBFS 1465#ifdef CONFIG_HUGETLB_PAGE
1466/* 1466/*
1467 * The following three functions are for anonymous (private mapped) hugepages. 1467 * The following three functions are for anonymous (private mapped) hugepages.
1468 * Unlike common anonymous pages, anonymous hugepages have no accounting code 1468 * Unlike common anonymous pages, anonymous hugepages have no accounting code
@@ -1503,4 +1503,4 @@ void hugepage_add_new_anon_rmap(struct page *page,
1503 atomic_set(&page->_mapcount, 0); 1503 atomic_set(&page->_mapcount, 0);
1504 __hugepage_set_anon_rmap(page, vma, address, 1); 1504 __hugepage_set_anon_rmap(page, vma, address, 1);
1505} 1505}
1506#endif /* CONFIG_HUGETLBFS */ 1506#endif /* CONFIG_HUGETLB_PAGE */