From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756323Ab2JCVZX (ORCPT ); Wed, 3 Oct 2012 17:25:23 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34317 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755989Ab2JCVZV (ORCPT ); Wed, 3 Oct 2012 17:25:21 -0400 Date: Wed, 3 Oct 2012 14:25:19 -0700 From: Andrew Morton To: David Rientjes Cc: Hugh Dickins , Linus Torvalds , Andrea Arcangeli , Naoya Horiguchi , KAMEZAWA Hiroyuki , Johannes Weiner , Michel Lespinasse , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [patch -mm] mm, thp: fix mlock statistics fix Message-Id: <20121003142519.93375e01.akpm@linux-foundation.org> In-Reply-To: References: <20121003131012.f88b0d66.akpm@linux-foundation.org> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 3 Oct 2012 14:10:41 -0700 (PDT) David Rientjes wrote: > > The free_page_mlock() hunk gets dropped because free_page_mlock() is > > removed. And clear_page_mlock() doesn't need this treatment. But > > please check my handiwork. > > > > I reviewed what was merged into -mm and clear_page_mlock() does need this > fix as well. argh, it got me *again*. grr. From: Andrew Morton Subject: mm: document PageHuge somewhat Cc: David Rientjes Cc: Mel Gorman Cc: Andrea Arcangeli Signed-off-by: Andrew Morton --- mm/hugetlb.c | 5 +++++ 1 file changed, 5 insertions(+) diff -puN mm/hugetlb.c~mm-document-pagehuge-somewhat mm/hugetlb.c --- a/mm/hugetlb.c~mm-document-pagehuge-somewhat +++ a/mm/hugetlb.c @@ -671,6 +671,11 @@ static void prep_compound_gigantic_page( } } +/* + * PageHuge() only returns true for hugetlbfs pages, but not for normal or + * transparent huge pages. See the PageTransHuge() documentation for more + * details. + */ int PageHuge(struct page *page) { compound_page_dtor *dtor; _