From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [folded-merged] mm-adaptive-hash-table-scaling-v2.patch removed from -mm tree Date: Thu, 06 Jul 2017 15:17:42 -0700 Message-ID: <595eb706.acP3c6wNRGoSWB5y%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33076 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751974AbdGFWRn (ORCPT ); Thu, 6 Jul 2017 18:17:43 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: pasha.tatashin@oracle.com, babu.moger@oracle.com, davem@davemloft.net, sfr@canb.auug.org.au, viro@zeniv.linux.org.uk, mm-commits@vger.kernel.org The patch titled Subject: mm-adaptive-hash-table-scaling-v2 has been removed from the -mm tree. Its filename was mm-adaptive-hash-table-scaling-v2.patch This patch was dropped because it was folded into mm-adaptive-hash-table-scaling.patch ------------------------------------------------------ From: Pavel Tatashin Subject: mm-adaptive-hash-table-scaling-v2 UL -> ULL fix Link: http://lkml.kernel.org/r/1495300013-653283-2-git-send-email-pasha.tatashin@oracle.com Signed-off-by: Pavel Tatashin Cc: David Miller Cc: Al Viro Cc: Babu Moger Cc: Stephen Rothwell Signed-off-by: Andrew Morton --- 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 @@ -7186,7 +7186,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) @@ -7222,7 +7222,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@oracle.com 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-v5.patch