lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 02 May 2016 16:47:10 +0530 From: "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, Andrew Morton <akpm@...ux-foundation.org>, Michael Ellerman <mpe@...erman.id.au>, Benjamin Herrenschmidt <benh@...nel.crashing.org>, linuxppc-dev@...ts.ozlabs.org Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Ebru Akagunduz <ebru.akagunduz@...il.com>, Rik van Riel <riel@...hat.com> Subject: Re: linux-next: build failure after merge of the akpm-current tree Stephen Rothwell <sfr@...b.auug.org.au> writes: > Hi Andrew, > > After merging the akpm-current tree, today's linux-next build (powerpc > allyesconfig and pseries_le_defconfig) failed like this: > > In file included from include/linux/mm.h:394: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 > > 6d34b9749be2 ("mm: make optimistic check for swapin readahead") > > interacting with commit > > dd1842a2a448 ("powerpc/mm: Make page table size a variable") > > from the powerpc tree. > > I applied this fix patch for today (hopefully this is still initialised > early enough): > > From: Stephen Rothwell <sfr@...b.auug.org.au> > Date: Mon, 2 May 2016 18:25:42 +1000 > Subject: [PATCH] mm: make optimistic check for swapin readahead fix > > Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@...ux.vnet.ibm.com> > --- > mm/huge_memory.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index f0cd9dbc1157..6aabfa166b6d 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -101,7 +101,7 @@ static DECLARE_WAIT_QUEUE_HEAD(khugepaged_wait); > * 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 unsigned long allocstall; > > static int khugepaged(void *none); > @@ -703,6 +703,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 > */ > -- > 2.7.0 > > > > > -- > Cheers, > Stephen Rothwell
Powered by blists - more mailing lists