Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp444139img; Fri, 22 Mar 2019 01:10:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7ulYvmE2olf8yZbdxvvP+C+GlwFy+7fTJCjpaZQqAR4hkaGXC54b89WigF0aWwuQnF+x/ X-Received: by 2002:a62:2046:: with SMTP id g67mr3181915pfg.121.1553242250227; Fri, 22 Mar 2019 01:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553242250; cv=none; d=google.com; s=arc-20160816; b=ZC6fZ9OWd2Ec+SdZgfP6Ahf2Uu5/93SiCIM5fJQf9MrXPFG9VS/aDhxxCpNTm7Lg3V UpSuT/AlBp/hRuo0gOWv9S+FmrOz3w4bnC/rBR5YNkqAHlf9vnlNE7Nclf5TRWT/JZOq 3axGuuFSRDDSyXS4TTSm29ZIvTwqufUzwPK6NBJZ34dEWWUv2keuh8a2q8S/sSL+Z73W IORIq4+0O+gWy2RNiIag1djhfQ+RJsOn8ZhfQTRl2ysUoD+OIkCZi22L7E+B06lSSwdi luyQ14GB0t/n8fIwwyYXfrMzuHms6xN4dD87Qy8QWXlMBOOT+7NsmLKG90gPxn0jBgXt CObQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=vuX9mjDqG9V5hTI4EOw+h7yoI6fzAlRXWPPWa05ZC2M=; b=BJMrOd+AoGwhSAbwMmq6ngAgBf/0a7sukUwToZTod2ktiHdkFfaWrCSH9+XtKMkEmJ SQZR6REsFRMzzQRpU0IVa9CTWQAPnGRLOsl5CC3l0/it8e58p/SWUNJkoqnEVwINgCyB ltRBBujpP6XhXHikhjawfWBms4ZNzXva86BWd7ikpEK1b/bIOC0QMgrMB+nagHEeoBaK HhfrHOY3SFGS9MuB7dqWkzS2jcq94Bp5xMlev9GtpLEWGSyZEJdvnSPNkO38CIfglE8v 8ttPqGjqxR0VOHM/7m2tMowJtD2xhtRRA6JeEZ6Kjcm9i6tAVxXn3jp25tWqqGqAzP9A i05g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="tAJMX/1t"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v9si6691006plg.187.2019.03.22.01.10.35; Fri, 22 Mar 2019 01:10:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="tAJMX/1t"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727772AbfCVIJK (ORCPT + 99 others); Fri, 22 Mar 2019 04:09:10 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:9710 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726350AbfCVIIm (ORCPT ); Fri, 22 Mar 2019 04:08:42 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44Qbrm1B3pz9v9vL; Fri, 22 Mar 2019 09:08:40 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=tAJMX/1t; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id J_EDFwehDTbV; Fri, 22 Mar 2019 09:08:40 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 44Qbrm04Vpz9v9vG; Fri, 22 Mar 2019 09:08:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1553242120; bh=vuX9mjDqG9V5hTI4EOw+h7yoI6fzAlRXWPPWa05ZC2M=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=tAJMX/1tKKfQOh0G5X9lWosgLupVLMJzOtgOkPwZxmwuCLhF2+rOW8ZkLNfjEuaM9 sesuovY46BGvXn1BeLCMKR5daYyLQWkf03l+uUMRUyG5/xPH+ZAy8JvCNX4Nb6waBa DcmNzSzixpqidmIUau/85NFpi9wKgfpqJyQCZyMY= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id EDF5B8B845; Fri, 22 Mar 2019 09:08:40 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 2r5_HJ1yyVDQ; Fri, 22 Mar 2019 09:08:40 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D3A958B844; Fri, 22 Mar 2019 09:08:40 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C99C46CD85; Fri, 22 Mar 2019 08:08:40 +0000 (UTC) Message-Id: <2d9fe7eac16d51000747648b5f84a58ef258633e.1553242059.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 2/7] powerpc/mm: define an empty mm_iommu_init() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 22 Mar 2019 08:08:40 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To avoid ifdefs, define a empty static inline mm_iommu_init() function when CONFIG_SPAPR_TCE_IOMMU is not selected. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/mmu_context.h | 1 + arch/powerpc/kernel/setup-common.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h index 6ee8195a2ffb..95b93ce428b7 100644 --- a/arch/powerpc/include/asm/mmu_context.h +++ b/arch/powerpc/include/asm/mmu_context.h @@ -52,6 +52,7 @@ static inline bool mm_iommu_is_devmem(struct mm_struct *mm, unsigned long hpa, { return false; } +static inline void mm_iommu_init(struct mm_struct *mm) { } #endif extern void switch_slb(struct task_struct *tsk, struct mm_struct *mm); extern void set_context(unsigned long id, pgd_t *pgd); diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 971f50d99d87..a90e8367ccde 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -956,9 +956,7 @@ void __init setup_arch(char **cmdline_p) #endif #endif -#ifdef CONFIG_SPAPR_TCE_IOMMU mm_iommu_init(&init_mm); -#endif irqstack_early_init(); exc_lvl_early_init(); emergency_stack_init(); -- 2.13.3