From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754203AbdBIUxm (ORCPT ); Thu, 9 Feb 2017 15:53:42 -0500 Received: from smtp2.provo.novell.com ([137.65.250.81]:49711 "EHLO smtp2.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752796AbdBIUxj (ORCPT ); Thu, 9 Feb 2017 15:53:39 -0500 From: Davidlohr Bueso To: akpm@linux-foundation.org Cc: manfred@colorfullife.com, dave@stgolabs.net, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Davidlohr Bueso Subject: [PATCH 4/4] mm,hugetlb: compute page_size_log properly Date: Thu, 9 Feb 2017 12:53:02 -0800 Message-Id: <1486673582-6979-5-git-send-email-dave@stgolabs.net> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1486673582-6979-1-git-send-email-dave@stgolabs.net> References: <1486673582-6979-1-git-send-email-dave@stgolabs.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The SHM_HUGE_* stuff was introduced in: 42d7395feb5 (mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB) It unnecessarily adds another layer, specific to sysv shm, without anything special about it: the macros are identical to the MAP_HUGE_* stuff, which in turn does correctly describe the hugepage subsystem. One example of the problems with extra layers what this patch fixes: mmap_pgoff() should never be using SHM_HUGE_* logic. It is obviously harmless but it would still be grand to get rid of it -- although now in the manpages I don't see that happening. Cc: linux-mm@kvack.org Signed-off-by: Davidlohr Bueso --- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index 499b988b1639..40b29aca18c1 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1479,7 +1479,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, struct user_struct *user = NULL; struct hstate *hs; - hs = hstate_sizelog((flags >> MAP_HUGE_SHIFT) & SHM_HUGE_MASK); + hs = hstate_sizelog((flags >> MAP_HUGE_SHIFT) & MAP_HUGE_MASK); if (!hs) return -EINVAL; -- 2.6.6