From patchwork Tue Sep 1 14:15:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 11748283 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 0BBCF138A for ; Tue, 1 Sep 2020 14:17:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BF178206EB for ; Tue, 1 Sep 2020 14:17:28 +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="vKUi3CT5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF178206EB 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 06354900010; Tue, 1 Sep 2020 10:17:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EDDA690000D; Tue, 1 Sep 2020 10:17:22 -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 DF1A9900010; Tue, 1 Sep 2020 10:17:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0039.hostedemail.com [216.40.44.39]) by kanga.kvack.org (Postfix) with ESMTP id C406890000D for ; Tue, 1 Sep 2020 10:17:22 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 81480824556B for ; Tue, 1 Sep 2020 14:17:22 +0000 (UTC) X-FDA: 77214695124.07.silk13_180cd3827098 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 7C2D51803F9D5 for ; Tue, 1 Sep 2020 14:17:16 +0000 (UTC) X-Spam-Summary: 1,0,0,01721b2ab2c2e10d,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:3873:3874:4321:5007:6261:6653:7514:9413:9592:10004:11026:11232: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.210.195:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.50.0.100;04yfgca5hnfeud6dtfq3f9zwdnw7zycjbzjypw6owtj1kiryopposqnd355dz4f.rc833ujpcac5zrjiftr4irrigbxbesquctpep3gka7683nk96m8ei7kofepwkg7.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: silk13_180cd3827098 X-Filterd-Recvd-Size: 4904 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Tue, 1 Sep 2020 14:17:03 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id m8so869756pfh.3 for ; Tue, 01 Sep 2020 07:17:03 -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=GA7usuAihtWp/iTn8pjSUo+agWDeKhUidbvz3amkOCk=; b=vKUi3CT5x2cUml5A3FoH5o7mANaQNhQQXmhG7RhK1IxI+2No8uNVjEZaMnr0IzA2e+ mFHVMn57j/G7jahwTvh57QZYZvU7vQqDCBPat2qS08dUl36IGB1voFOeurV2SO5lo8pV uoi4tzm9zkWj9YrnimXxoRrV14iINOLZsZYMoQrd6IWNfezf/1EGZMNSmfEZWLvvfWT1 blAfw7qPOqKSWzr1VkfaBD8C1QoL3fc8uwnEOLT9+uDmP3XOJdDnXwxVsAqWls4Hdg1N pJses5elE/RX6Oea6bkY0P/rjv6Cch/kHx1VldEEsG1ApybMcX2COkroEQky+gc3T5uU k9CQ== 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=GA7usuAihtWp/iTn8pjSUo+agWDeKhUidbvz3amkOCk=; b=fxIVtzoLzz/cAq682KTDoxp3VsQ7hmmCRZgO0uJIySxH3F9NH93GCieH/okTiAvsIr r2oD44PxiLcr9jy1Ej2zSg5i46+ZE1oby4ZU0vTAAKMnKY4bYmg48cuTxrCP1DGSuNwZ l90YnpD2Gccbu0PQQX8P0+F/n5Uhnd+AS1/b9EQqywg4W6hR5bHrLpagcPxbqLyml7gW DSz7RUToSEKXpEMcdpotWjDDF1upV/Qu3/O59KnCKqp+zgCEm61eCtFNlfcXrGB0z8Tr RiLqo4bHHpSusx+e5jwpCGq4SLvLqrMD8qP2IE2jTgMgDNMaBWj0AHaGtZRNHNxgCx/z DKAw== X-Gm-Message-State: AOAM533ovpy6RC4ZOs2TsJI950U8FRtZO5gw6Cqb7N6ThFOBWbzDiheb 1SRbtN90iIrQwa0+Q00jdfo= X-Google-Smtp-Source: ABdhPJzeqxrrUqdUUsxeoS6rzUl1Puk+QzDB+Z29ZkL6FZRno1ci3PQMh4rLsPoa0DyPjGjLi0oj/w== X-Received: by 2002:a62:fc46:: with SMTP id e67mr2009061pfh.109.1598969823177; Tue, 01 Sep 2020 07:17:03 -0700 (PDT) Received: from bobo.ibm.com ([203.185.249.227]) by smtp.gmail.com with ESMTPSA id w9sm2212816pgg.76.2020.09.01.07.16.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 07:17:02 -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 v3 19/23] sh: use asm-generic/mmu_context.h for no-op implementations Date: Wed, 2 Sep 2020 00:15:35 +1000 Message-Id: <20200901141539.1757549-20-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200901141539.1757549-1-npiggin@gmail.com> References: <20200901141539.1757549-1-npiggin@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7C2D51803F9D5 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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 Acked-by: Rich Felker --- Please ack or nack if you object to this being mered via Arnd's tree. 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) {