From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751163AbdCNMPJ (ORCPT ); Tue, 14 Mar 2017 08:15:09 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:51240 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750797AbdCNMPI (ORCPT ); Tue, 14 Mar 2017 08:15:08 -0400 From: Arnd Bergmann To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Andrew Morton Cc: Arnd Bergmann , Dave Jiang , Thomas Garnier , Kees Cook , Dave Hansen , Hugh Dickins , Borislav Petkov , linux-kernel@vger.kernel.org Subject: [PATCH] mm, x86: fix native_pud_clear build error Date: Tue, 14 Mar 2017 13:12:53 +0100 Message-Id: <20170314121330.182155-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:ZoVIsd7FmAB1U8GbLgq92mL9CrXjDhgDgiuEVjvrm/8XLz13i4H gPZFk+a35RoFiGIdipw9hplEAnKRUTc4ewiTc4VZ2EEDftHunFCvqVndFCmwOFAZHLMD7P4 vFNlsOMQhCnqlrg/TesOdjxn3f/AXDhIoHmUgy26BkfsVuL1TJ2hPi4yV5vKD0mIfK0C29q zY/jre4pQ9bmA/lMF6E/w== X-UI-Out-Filterresults: notjunk:1;V01:K0:/emgnFwucDo=:uBGeISRQW/wcc7xhB8LzuY gSmZUagLtDJ9yMW8OY1ytS5hTeObyGiJjvDaKvmLINsKVbZRMt5HDfPYernaGMm5wvrkSXCGk TWwPMCRF8pD2KHsZtF6p7hzjFhBxBHgLGhg9ZCC1NSeyTUegYZDe+t+54+6/Dwj+vqX5RPnEj aZgioUI6omnaRBlwbgZrDUIO3SPqvwOhQBtwDHbMlbo+aTzG5zCAsyQeRNwjydQdPa4VjIUwj uO9pGsKQA2KgcEJyFM87izzAOfyztgF5Vs9oKkWgFtiBKJDsh1BnOH73RImWJUrfQCCMKpgJs yKHa6V0kJIjPKVKL2QO7Aim2ED5AgLKokS1aru0BmrjAGT0nvDfHYr+yQC2eB/bVwjS/CKkpB n8V71ZNVZcxfn8fPXT9YeJX+8F5UgHEnT6EHPxaTo8gBkv96MVgHhfMYDezHyvBSEVazgqkiR 5iyiR1YYTte2Z69W71Ciz+n4x4vzdJMq9UOB/VucwVbpHvupjgspme3K/EBHR1I/nD3pUOF9H XtisplhK10qRrnptcioM6vJ/4Gml83REMqKqplFUbBZ06FcJE0p7U2TgoSfissFzkhwLB54gX viJDOdA0TrgctBrUPdTamD75R1DzSbxKEFd1vzhaH/lykJ+mIe0Bw+cmY+p3CGJsjNCKp3gaq 8ErHajRWh7WYfxv2O39eCSv43fq0dFbVH8fwQjHDzChv1WgOu7ZNwfFyq2jKXbYyGDzc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 72277b1028a5..50d35e3185f5 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 1cfb36b8c024..585ee0d42d18 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 -- 2.9.0