Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e3390f67a7267daa227380b6f1bbf13c7ddd4aff

Authored by Naoya Horiguchi
Committed by Andi Kleen
1 parent 43131e141a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

include/linux/hugetlb_inline.h
Diff comments   View file @ e3390f6
1 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 6 #include <linux/mm.h>
7 7  
... ... @@ -1462,7 +1462,7 @@
1462 1462 }
1463 1463 #endif /* CONFIG_MIGRATION */
1464 1464  
1465   -#ifdef CONFIG_HUGETLBFS
  1465 +#ifdef CONFIG_HUGETLB_PAGE
1466 1466 /*
1467 1467 * The following three functions are for anonymous (private mapped) hugepages.
1468 1468 * Unlike common anonymous pages, anonymous hugepages have no accounting code
... ... @@ -1503,5 +1503,5 @@
1503 1503 atomic_set(&page->_mapcount, 0);
1504 1504 __hugepage_set_anon_rmap(page, vma, address, 1);
1505 1505 }
1506   -#endif /* CONFIG_HUGETLBFS */
  1506 +#endif /* CONFIG_HUGETLB_PAGE */