The patch titled Subject: mm-adaptive-hash-table-scaling-v2 has been added to the -mm tree. Its filename is mm-adaptive-hash-table-scaling-v2.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-adaptive-hash-table-scaling-v2.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-adaptive-hash-table-scaling-v2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx> Subject: mm-adaptive-hash-table-scaling-v2 UL -> ULL fix Link: http://lkml.kernel.org/r/1495300013-653283-2-git-send-email-pasha.tatashin@xxxxxxxxxx Signed-off-by: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx> Cc: David Miller <davem@xxxxxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Babu Moger <babu.moger@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/page_alloc.c~mm-adaptive-hash-table-scaling-v2 mm/page_alloc.c --- a/mm/page_alloc.c~mm-adaptive-hash-table-scaling-v2 +++ a/mm/page_alloc.c @@ -7173,7 +7173,7 @@ static unsigned long __init arch_reserve * quadruples the scale is increased by one, which means the size of hash table * only doubles, instead of quadrupling as well. */ -#define ADAPT_SCALE_BASE (64ul << 30) +#define ADAPT_SCALE_BASE (64ull << 30) #define ADAPT_SCALE_SHIFT 2 #define ADAPT_SCALE_NPAGES (ADAPT_SCALE_BASE >> PAGE_SHIFT) @@ -7209,7 +7209,7 @@ void *__init alloc_large_system_hash(con numentries = round_up(numentries, (1<<20)/PAGE_SIZE); if (!high_limit) { - unsigned long adapt; + unsigned long long adapt; for (adapt = ADAPT_SCALE_NPAGES; adapt < numentries; adapt <<= ADAPT_SCALE_SHIFT) _ Patches currently in -mm which might be from pasha.tatashin@xxxxxxxxxx are mm-zeroing-hash-tables-in-allocator.patch mm-updated-callers-to-use-hash_zero-flag.patch mm-adaptive-hash-table-scaling.patch mm-adaptive-hash-table-scaling-v2.patch sparc64-ng4-memset-32-bits-overflow.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