From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752746AbdCNTeW (ORCPT ); Tue, 14 Mar 2017 15:34:22 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47056 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751459AbdCNTeV (ORCPT ); Tue, 14 Mar 2017 15:34:21 -0400 Date: Tue, 14 Mar 2017 12:34:02 -0700 From: tip-bot for Arnd Bergmann Message-ID: Cc: dave.jiang@intel.com, arnd@arndb.de, hughd@google.com, keescook@chromium.org, linux-kernel@vger.kernel.org, thgarnie@google.com, mingo@kernel.org, bp@suse.de, tglx@linutronix.de, dave.hansen@linux.intel.com, akpm@linux-foundation.org, hpa@zytor.com Reply-To: keescook@chromium.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, thgarnie@google.com, bp@suse.de, mingo@kernel.org, hpa@zytor.com, akpm@linux-foundation.org, dave.hansen@linux.intel.com, arnd@arndb.de, dave.jiang@intel.com, hughd@google.com In-Reply-To: <20170314121330.182155-1-arnd@arndb.de> References: <20170314121330.182155-1-arnd@arndb.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] mm, x86: Fix native_pud_clear build error Git-Commit-ID: d434936e4cbb10181463622962f30b989d3e9e19 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d434936e4cbb10181463622962f30b989d3e9e19 Gitweb: http://git.kernel.org/tip/d434936e4cbb10181463622962f30b989d3e9e19 Author: Arnd Bergmann AuthorDate: Tue, 14 Mar 2017 13:12:53 +0100 Committer: Thomas Gleixner CommitDate: Tue, 14 Mar 2017 20:30:30 +0100 mm, x86: Fix native_pud_clear build error We still get a build error in random configurations, after this has been modified a few times: In file included from include/linux/mm.h:68:0, from include/linux/suspend.h:8, from arch/x86/kernel/asm-offsets.c:12: arch/x86/include/asm/pgtable.h:66:26: error: redefinition of 'native_pud_clear' #define pud_clear(pud) native_pud_clear(pud) My interpretation is that the build error comes from a typo in __PAGETABLE_PUD_FOLDED, so fix that typo now, and remove the incorrect #ifdef around the native_pud_clear definition. Fixes: 3e761a42e19c ("mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()") Fixes: a00cc7d9dd93 ("mm, x86: add support for PUD-sized transparent hugepages") Signed-off-by: Arnd Bergmann Acked-by: Dave Jiang Cc: Kees Cook Cc: Dave Hansen Cc: Hugh Dickins Cc: Andrew Morton Cc: Borislav Petkov Cc: Thomas Garnier Link: http://lkml.kernel.org/r/20170314121330.182155-1-arnd@arndb.de Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/pgtable-3level.h | 3 --- arch/x86/include/asm/pgtable.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h index 72277b1..50d35e3 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h @@ -121,12 +121,9 @@ static inline void native_pmd_clear(pmd_t *pmd) *(tmp + 1) = 0; } -#if !defined(CONFIG_SMP) || (defined(CONFIG_HIGHMEM64G) && \ - defined(CONFIG_PARAVIRT)) static inline void native_pud_clear(pud_t *pudp) { } -#endif static inline void pud_clear(pud_t *pudp) { diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 1cfb36b..585ee0d 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -62,7 +62,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); # define set_pud(pudp, pud) native_set_pud(pudp, pud) #endif -#ifndef __PAGETABLE_PMD_FOLDED +#ifndef __PAGETABLE_PUD_FOLDED #define pud_clear(pud) native_pud_clear(pud) #endif