From patchwork Wed Feb 15 20:31:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 728375 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vNrZY1pYyz9rxm for ; Thu, 16 Feb 2017 07:32:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752105AbdBOUcJ (ORCPT ); Wed, 15 Feb 2017 15:32:09 -0500 Received: from mga11.intel.com ([192.55.52.93]:53390 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750791AbdBOUbJ (ORCPT ); Wed, 15 Feb 2017 15:31:09 -0500 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Feb 2017 12:31:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,166,1484035200"; d="scan'208";a="65161388" Received: from djiang5-desk3.ch.intel.com ([143.182.137.38]) by orsmga005.jf.intel.com with ESMTP; 15 Feb 2017 12:31:08 -0800 Subject: [PATCH] mm,x86: fix SMP x86 32bit build for native_pud_clear() From: Dave Jiang To: akpm@linux-foundation.org Cc: keescook@google.com, mawilcox@microsoft.com, linux-nvdimm@lists.01.org, dave.hansen@linux.intel.com, linux-xfs@vger.kernel.org, linux-mm@kvack.org, kirill.shutemov@linux.intel.com, jack@suse.com, dan.j.williams@intel.com, linux-ext4@vger.kernel.org, ross.zwisler@linux.intel.com, vbabka@suse.cz, alexander.kapshuk@gmail.com Date: Wed, 15 Feb 2017 13:31:08 -0700 Message-ID: <148719066814.31111.3239231168815337012.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org The fix introduced by e4decc90 to fix the UP case for 32bit x86, however that broke the SMP case that was working previously. Add ifdef so the dummy function only show up for 32bit UP case only. Fix: e4decc90 mm,x86: native_pud_clear missing on i386 build Reported-by: Alexander Kapshuk Signed-off-by: Dave Jiang --- arch/x86/include/asm/pgtable-3level.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h index 50d35e3..8f50fb3 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h @@ -121,9 +121,11 @@ static inline void native_pmd_clear(pmd_t *pmd) *(tmp + 1) = 0; } +#ifndef CONFIG_SMP static inline void native_pud_clear(pud_t *pudp) { } +#endif static inline void pud_clear(pud_t *pudp) {