From patchwork Wed Aug 26 14:52:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 11738723 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7967C109B for ; Wed, 26 Aug 2020 14:54:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3D63221741 for ; Wed, 26 Aug 2020 14:54:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ABCc0wxz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D63221741 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 53BCE6B000E; Wed, 26 Aug 2020 10:54:21 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4CB666B0031; Wed, 26 Aug 2020 10:54:21 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3418E6B0033; Wed, 26 Aug 2020 10:54:21 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0020.hostedemail.com [216.40.44.20]) by kanga.kvack.org (Postfix) with ESMTP id 1AD7F6B000E for ; Wed, 26 Aug 2020 10:54:21 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D3FA9180AD811 for ; Wed, 26 Aug 2020 14:54:20 +0000 (UTC) X-FDA: 77193015480.17.gun58_1d1502e27065 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id C387D180D078B for ; Wed, 26 Aug 2020 14:54:12 +0000 (UTC) X-Spam-Summary: 1,0,0,bec0140f45bd6b54,d41d8cd98f00b204,npiggin@gmail.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1431:1437:1515:1534:1541:1711:1730:1747:1777:1792:1978:1981:2194:2199:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3867:3871:3874:4321:5007:6261:6653:7514:9413:9592:10004:11026:11473:11657:11658:11914:12043:12109:12296:12297:12438:12517:12519:12555:12895:12986:13069:13311:13357:13894:14096:14181:14384:14394:14687:14721:21080:21433:21444:21451:21627:21666:30054:30075,0,RBL:209.85.214.195:@gmail.com:.lbl8.mailshell.net-62.50.0.100 66.100.201.100;04yge3iq8mju4737qux5tm5nxjsrhopoxrex4kwhrtj1kiryop8huaycjahchin.ggfrffi1nreba6mpftr4irrigbxbesquctpep3gka7683nk96m8ei7kofepwkg7.q-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: gun58_1d1502e27065 X-Filterd-Recvd-Size: 4871 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Wed, 26 Aug 2020 14:54:11 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id t11so1006713plr.5 for ; Wed, 26 Aug 2020 07:54:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F+CDYnf/xWMGywxFUASijaNggUa5Y5mjXoyq0c/F/hQ=; b=ABCc0wxzXmQFbpavgTux2cZChkynQe0eihohjnlQa09LtXmp5CCC3kOM/xH/BNwhYC eNBsB7z1RZ734xLZ/R0Y4RRlTYsyinkZm6BDq3RLmBgiZgHqOs6gjpGJ4bbHvkcBQ2Bo v5zsVxE9zwpFB3wK9fAJsA94LdFboAA9yUYy+ur5lk1Xe/IAFY2JUdzSEK/1feUyU9JE 7WrjdhHvKqmllN/ic6WM+JKwtfNFBrYgPgTDCT6+sB2JHbP4/qTkQCQsddD9Mx6NJmT1 U6PN52eFRFQe2QL5uIKxDJAycpivr+nXLFshi4snzJqhap52t7bmvf+w0biB2bB015xc AF9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F+CDYnf/xWMGywxFUASijaNggUa5Y5mjXoyq0c/F/hQ=; b=S7hmfiBdTjQ5aKNXp7UE1nClBPz0e0w8rJdfES4ATceN8zpDqFKiY8gR3D/XdFdTfG Sk5YeR43DMtUDXdDewG6Em89tkFU0mFx29jg4RSPXAxTRhkkw3G42RZNrHWuHt9KGllz x7NTgi2XcnGUFZC/04fjt3mgNoMnn56edeFx65lnpEOBpqMVX0VC1dUfTBjI5JNNs6Yi ZPHsexGn6hmYwDp5lNO42SIilrYQ2hwlg/QGdZzXCZmMzoFHXwOE2VciuxIDdiaLwCYR 5EFTmBgjdOAhGUWhv9SB42D1btINqw86QmLOnKMZNiDIBJ8frgIMOwhWC4uLpvUgbghL 3uWg== X-Gm-Message-State: AOAM532z98QXCrEdRc/M2tLISgaD8d2RKD1RKGTfLK/3OG7139fYfQDy ISIS0tsBJsELQhiHGuQb6EobW+4az24= X-Google-Smtp-Source: ABdhPJxGES4oTiL4srNoZVKcYTuqSIOU/NOB2lV5KOk23i9GiHBmxVxj3/D912wRJ0jpOMkhamtulQ== X-Received: by 2002:a17:902:7044:: with SMTP id h4mr12344048plt.78.1598453650781; Wed, 26 Aug 2020 07:54:10 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (61-68-212-105.tpgi.com.au. [61.68.212.105]) by smtp.gmail.com with ESMTPSA id r7sm3327140pfl.186.2020.08.26.07.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 07:54:10 -0700 (PDT) From: Nicholas Piggin To: linux-arch@vger.kernel.org Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Arnd Bergmann , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH v2 19/23] sh: use asm-generic/mmu_context.h for no-op implementations Date: Thu, 27 Aug 2020 00:52:45 +1000 Message-Id: <20200826145249.745432-20-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200826145249.745432-1-npiggin@gmail.com> References: <20200826145249.745432-1-npiggin@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: C387D180D078B X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Signed-off-by: Nicholas Piggin --- arch/sh/include/asm/mmu_context.h | 5 ++--- arch/sh/include/asm/mmu_context_32.h | 9 --------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h index 461b1304580b..78eef4e7d5df 100644 --- a/arch/sh/include/asm/mmu_context.h +++ b/arch/sh/include/asm/mmu_context.h @@ -84,6 +84,7 @@ static inline void get_mmu_context(struct mm_struct *mm, unsigned int cpu) * Initialize the context related info for a new mm_struct * instance. */ +#define init_new_context init_new_context static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm) { @@ -120,9 +121,7 @@ static inline void switch_mm(struct mm_struct *prev, activate_context(next, cpu); } -#define activate_mm(prev, next) switch_mm((prev),(next),NULL) -#define deactivate_mm(tsk,mm) do { } while (0) -#define enter_lazy_tlb(mm,tsk) do { } while (0) +#include #else diff --git a/arch/sh/include/asm/mmu_context_32.h b/arch/sh/include/asm/mmu_context_32.h index 71bf12ef1f65..bc5034fa6249 100644 --- a/arch/sh/include/asm/mmu_context_32.h +++ b/arch/sh/include/asm/mmu_context_32.h @@ -2,15 +2,6 @@ #ifndef __ASM_SH_MMU_CONTEXT_32_H #define __ASM_SH_MMU_CONTEXT_32_H -/* - * Destroy context related info for an mm_struct that is about - * to be put to rest. - */ -static inline void destroy_context(struct mm_struct *mm) -{ - /* Do nothing */ -} - #ifdef CONFIG_CPU_HAS_PTEAEX static inline void set_asid(unsigned long asid) {