From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AE2FC64E69 for ; Tue, 24 Nov 2020 00:30:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D778B2222B for ; Tue, 24 Nov 2020 00:29:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="b54pIT41" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729861AbgKXA3y (ORCPT ); Mon, 23 Nov 2020 19:29:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729807AbgKXA3w (ORCPT ); Mon, 23 Nov 2020 19:29:52 -0500 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3160C061A4D for ; Mon, 23 Nov 2020 16:29:51 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id s13so1185475wmh.4 for ; Mon, 23 Nov 2020 16:29:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m/kFRqUqwxijt/DGbS3WOuCvqMr9UHx0WnOtO3sm9XE=; b=b54pIT41AYJZEExrHBSx9U6mfbeW+EjiTmxg3rqOzonVYS+1OcU+vD34fyG5Gpi1ca 257/tXsGXDh+xOjHQ/x/O/XiqQcsExngL27Earq8QRMU+TECAMsfdOI4rMRDeOB65jUX TJT2H/+ujKc3g2moWNQiS4R/cPj6Y3YMytVuQWuqwaLGMC9SqbJZbbaNFlb04t1EJJ6X KFFRrIr6NxK+jEsFzqA5RDzbo4N9dF7COi3ZjoFYCSeax3nnDqJnkhHUFYbatZhxHBGR 1vFSIR2fU19xnpxi/v01k+dX1EXVcuCQxBoog+hbJUgfkRGeeV59dmqGVM62tpvBaKgr MgqQ== 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=m/kFRqUqwxijt/DGbS3WOuCvqMr9UHx0WnOtO3sm9XE=; b=EeQJ+ic1jfkRc+Eg6nweEDq0XLYHjErRA5KtgFqem6ExsLpELbiMqH+WUwqoZDnQZJ j74DgeF0K5cGCIZaIgNsmI6WPZudUFwcly3J+2L2BxlLeHR3TQmGjJZ8T/xZolAU66nD w4R7esPsaH4yMG+MpkyYCPRddSQB+RDbAcH/GxzNhU+TelSAh2j7icFfiGne9MrxGZAM 2T0YhHEPeyw74FIz6I7DMt0ajC5u+JlTCRTMo2cE7sUZbOA6dTzqLIy+5Fhjn/CXIUG3 qIDXtqiAy5Jsw1lDDB9V5yM3HstX8ZlOni1pyxHkyZvKnL+UuWFu1nthtNvyBqfkqkBf QCdg== X-Gm-Message-State: AOAM5324ByzH5rr17pMuN2WAJTPrl4mLzvzC6wMEe3801xk9HVlg/cL3 zd3YUqmW21miiyPoyzRo2/BvSG20Y7WrNl2R X-Google-Smtp-Source: ABdhPJxxJF3XMzaU9a8FkG0PfgkwlbKF5WIGqMSsecPkybQrZkYA+btTNXLgry0Ef11zEbtDNHZh1w== X-Received: by 2002:a05:600c:2197:: with SMTP id e23mr1406145wme.42.1606177790120; Mon, 23 Nov 2020 16:29:50 -0800 (PST) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id c6sm25047360wrh.74.2020.11.23.16.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 16:29:49 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Alexander Viro , Andrew Morton , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christophe Leroy , Guo Ren , "H. Peter Anvin" , Ingo Molnar , Oleg Nesterov , Russell King , Thomas Bogendoerfer , Thomas Gleixner , Vincenzo Frascino , Will Deacon , x86@kernel.org, "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH v2 10/19] sparc/vdso: Remove vdso pointer from mm->context Date: Tue, 24 Nov 2020 00:29:23 +0000 Message-Id: <20201124002932.1220517-11-dima@arista.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201124002932.1220517-1-dima@arista.com> References: <20201124002932.1220517-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Not used any more. Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org Signed-off-by: Dmitry Safonov --- arch/sparc/include/asm/mmu_64.h | 1 - arch/sparc/vdso/vma.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/sparc/include/asm/mmu_64.h b/arch/sparc/include/asm/mmu_64.h index 7e2704c770e9..8e7892890d14 100644 --- a/arch/sparc/include/asm/mmu_64.h +++ b/arch/sparc/include/asm/mmu_64.h @@ -111,7 +111,6 @@ typedef struct { unsigned long thp_pte_count; struct tsb_config tsb_block[MM_NUM_TSBS]; struct hv_tsb_descr tsb_descr[MM_NUM_TSBS]; - void *vdso; bool adi; tag_storage_desc_t *tag_store; spinlock_t tag_lock; diff --git a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c index bf9195fe9bcc..255e052223ca 100644 --- a/arch/sparc/vdso/vma.c +++ b/arch/sparc/vdso/vma.c @@ -389,7 +389,6 @@ static int map_vdso(const struct vdso_image *image, } text_start = addr - image->sym_vvar_start; - current->mm->context.vdso = (void __user *)text_start; /* * MAYWRITE to allow gdb to COW and set breakpoints @@ -418,9 +417,7 @@ static int map_vdso(const struct vdso_image *image, } up_fail: - if (ret) - current->mm->context.vdso = NULL; - else + if (!ret) *sysinfo_ehdr = text_start; mmap_write_unlock(mm); -- 2.29.2