From patchwork Wed May 27 11:56:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11572813 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 EFFEC60D for ; Wed, 27 May 2020 12:15:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C26DB20657 for ; Wed, 27 May 2020 12:15:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pj9HYWvS"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="punGG7/l" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C26DB20657 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Nj+ess8e4hsExPELvkDW2d8sAbgxLz3LRGzd1Xp4czo=; b=pj9HYWvSMyhgjL jPdB1QCVC/0yClU2g4JrthgX+MQasx/v92AFXhleN5rU7y1k8q2juw85ZfJYfuXbMom/Y/C37kx9r Zm1BXKKvz43r2bxe6zOK6AAtoSYqLkQM9b2VOeUbU4zPxBRB8kAATwrCr/kAFRZK/8+fiUO29+rtt Pgf4Ij10IrE5qL1OtSt77FIhIm9viJGxZYCp/hUYpaaVMp1vCdSMagptS+7L5zpBVCOhxSoAuEKhH T5Zgf+Of1G6k000Tu+5p3xUzDdI4oII6qWHCvefLknGySCr1QqxQjBpPFgsRheQZeL0jkv/kvibDs 52XYASY5wwR4lBLfrYlA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jduyF-0002ib-7x; Wed, 27 May 2020 12:15:43 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jduhU-00048j-GG for linux-arm-kernel@lists.infradead.org; Wed, 27 May 2020 11:58:34 +0000 Received: by mail-lf1-x144.google.com with SMTP id r125so14251172lff.13 for ; Wed, 27 May 2020 04:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rYrZ6BNeShCtzdDME/YtGKRfZIxdp9G0kT5ZVD+CsCM=; b=punGG7/lcxtEUybVw/AkDDIp96wgkX0q1A2AfkZP8+e4I1WWgtGhI6QrE5IqqAxJRW gqEZx5we5EzJA6+G0ZWNvoeQqoi7FGu2BD6pIV4BkzJPg4QCuz04dcS9s4qYJ6U5inaN 1YAURPfKqwXBpRn0bnTFH6Ssy7h0TDt5RYHnVud2Az+f72gFTndXUg9cuqDAsWmHmoCI O6uRRKmjAypbjOllD1OcDTT+YW7rEIiiRocExjTPWxNLX8ecMdOmgd2gjy3HE+x3s/gC uC6txx7GUBYw4DdCS7/lD/pkeXc4edYjPBaDTzQXHDR+Q1NYZXQWRM+LLWlM3Dx44x7Y 9NtA== 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:mime-version :content-transfer-encoding; bh=rYrZ6BNeShCtzdDME/YtGKRfZIxdp9G0kT5ZVD+CsCM=; b=lQuEh1b1AeZCZjB/Gg8q1WSqCWknlxkAELPdVA9zFqaDv7bBt5pA/Ke0Zryq0r+Plt KbDDNcO+sfaFh5zRjNXQAp0qGwr3J4ur78uF/aCr1griKObPTg9WZj+a2s5pzkeWFng1 kP4nIWFr3rvutY7GYsu7SJ1lrpmjP4erlBqNozO4GjkhW8VOw1QA/maBQtcspZAiJ784 n4cmFGgrd4xG+4kpZsK53NvV/SSMUZ8BXu2J218+gSZooqvBrvZM9IQbocVw/rJ+OTWK pDGEjOKkDCvdesDn945/sslvsDh2tqdGbgr3JKyQISOMFGS9aKpMHj69aXOYE98qPmg6 8Kzg== X-Gm-Message-State: AOAM5330jtpzQiJIRilFg6COvea4pOEfmusuxKHSviwVjHqMILGVnwDK hIUMq/UmwdgI9xC2DO1LyEx8s1/2odQ= X-Google-Smtp-Source: ABdhPJz6BnIVdaE6omirT8WzHpqNo4HjEQiM4vi6c+coCdJpG45JgBzX6eMvw9f4MmtGXXbkt4Hn2Q== X-Received: by 2002:a19:bc4:: with SMTP id 187mr3007790lfl.211.1590580701220; Wed, 27 May 2020 04:58:21 -0700 (PDT) Received: from localhost.localdomain (c-8cdb225c.014-348-6c756e10.bbcust.telenor.se. [92.34.219.140]) by smtp.gmail.com with ESMTPSA id 2sm648936lji.100.2020.05.27.04.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 04:58:20 -0700 (PDT) From: Linus Walleij To: Russell King Subject: [PATCH v2] ARM: mm: Simplify act_mm macro Date: Wed, 27 May 2020 13:56:18 +0200 Message-Id: <20200527115618.92792-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200527_045824_578929_43402B8D X-CRM114-Status: UNSURE ( 9.60 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:144 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The act_mm assembly macro is actually partly reimplementing get_thread_info so let's just use that. Suggested-by: Russell King Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Accidentally removed the index to the active task which is what we want here. --- arch/arm/mm/proc-macros.S | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 60ac7c5999a9..e2c743aa2eb2 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -5,7 +5,6 @@ * VMA_VM_FLAGS * VM_EXEC */ -#include #include #include @@ -31,8 +30,7 @@ * act_mm - get current->active_mm */ .macro act_mm, rd - bic \rd, sp, #(THREAD_SIZE - 1) & ~63 - bic \rd, \rd, #63 + get_thread_info \rd ldr \rd, [\rd, #TI_TASK] .if (TSK_ACTIVE_MM > IMM12_MASK) add \rd, \rd, #TSK_ACTIVE_MM & ~IMM12_MASK