From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753168AbbLOGon (ORCPT ); Tue, 15 Dec 2015 01:44:43 -0500 Received: from ozlabs.org ([103.22.144.67]:57699 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752273AbbLOGom (ORCPT ); Tue, 15 Dec 2015 01:44:42 -0500 Date: Tue, 15 Dec 2015 17:44:39 +1100 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman , Benjamin Herrenschmidt , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Aneesh Kumar K.V" , "Kirill A. Shutemov" Subject: Re: linux-next: manual merge of the akpm-current tree with the powerpc tree Message-ID: <20151215174439.4fd3177c@canb.auug.org.au> In-Reply-To: <20151215165342.15bb4526@canb.auug.org.au> References: <20151215165342.15bb4526@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; 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 Hi Andrew, On Tue, 15 Dec 2015 16:53:42 +1100 Stephen Rothwell wrote: > > diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h > index 8b929e531758..4e69d9a273ed 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash.h > +++ b/arch/powerpc/include/asm/book3s/64/hash.h > @@ -48,9 +43,8 @@ > /* > * set of bits not changed in pmd_modify. > */ > -#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | \ > - _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPLITTING | \ > - _PAGE_THP_HUGE | _PAGE_PTE) > +#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | ^ I missed a backslash here which I fixed up in my tree. > + _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au