The patch titled
Subject: linux-next: build failure after merge of the akpm-current tree
has been removed from the -mm tree. Its filename was
mm-make-optimistic-check-for-swapin-readahead-fix-4.patch
This patch was dropped because it was folded into mm-make-optimistic-check-for-swapin-readahead.patch
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: linux-next: build failure after merge of the akpm-current tree
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (powerpc
allyesconfig) failed like this:
In file included from include/linux/mm.h:400:0,
from mm/huge_memory.c:10:
include/linux/huge_mm.h:53:22: error: initializer element is not constant
#define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
^
mm/huge_memory.c:104:62: note: in expansion of macro 'HPAGE_PMD_NR'
static unsigned int khugepaged_max_ptes_swap __read_mostly = HPAGE_PMD_NR/8;
^
Caused by commit
5c38823a834f ("mm: make optimistic check for swapin readahead")
We had this error some time ago, so I have added teh same patch as
last time:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 2 May 2016 18:25:42 +1000
Subject: [PATCH] mm: make optimistic check for swapin readahead fix
Link: http://lkml.kernel.org/r/20160616154503.65806e12@xxxxxxxxxxxxxxxx
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
1 file changed, 2 insertions(+), 1 deletion(-)
index f0cd9dbc1157..6aabfa166b6d 100644
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/huge_memory.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN mm/huge_memory.c~mm-make-optimistic-check-for-swapin-readahead-fix-4 mm/huge_memory.c
--- a/mm/huge_memory.c~mm-make-optimistic-check-for-swapin-readahead-fix-4
+++ a/mm/huge_memory.c
@@ -101,7 +101,7 @@ static DECLARE_WAIT_QUEUE_HEAD(khugepage
* fault.
*/
static unsigned int khugepaged_max_ptes_none __read_mostly;
-static unsigned int khugepaged_max_ptes_swap __read_mostly = HPAGE_PMD_NR/8;
+static unsigned int khugepaged_max_ptes_swap __read_mostly;
static int khugepaged(void *none);
static int khugepaged_slab_init(void);
@@ -704,6 +704,7 @@ static int __init hugepage_init(void)
khugepaged_pages_to_scan = HPAGE_PMD_NR * 8;
khugepaged_max_ptes_none = HPAGE_PMD_NR - 1;
+ khugepaged_max_ptes_swap = HPAGE_PMD_NR / 8;
/*
* hugepages can't be allocated by the buddy allocator
*/
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
mm-make-optimistic-check-for-swapin-readahead.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
