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=-12.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 4D88AC388F2 for ; Sun, 8 Nov 2020 05:18:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 084FB22255 for ; Sun, 8 Nov 2020 05:18:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="neMv9FZ7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728778AbgKHFSb (ORCPT ); Sun, 8 Nov 2020 00:18:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728425AbgKHFRs (ORCPT ); Sun, 8 Nov 2020 00:17:48 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08042C0613D4 for ; Sat, 7 Nov 2020 21:17:48 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id r17so1420140wrw.1 for ; Sat, 07 Nov 2020 21:17:47 -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=tkLh0FZVC1l01ZndeEmge2GbTRSpNuP7ms2slDapalo=; b=neMv9FZ7D6zt5fes0a16Lk4hMho8WCoK8l+WcdffETz5c0j5ZG8syOrjzH8cV23RXP qvHZnkmd5WTWFRrMrtdjdnpitUGm0OOcg7H198zTVfORxTaGbjFi+AsumFU0kBMezyf8 I6/N3hIhnlOIKeiR1VUuaF95iAUaWk//cmA+gbkzYVwGStcN53lIdcnRg9rnH1Tvn8Hz 6DzsmP4v1neIqKZaVa0Wt0LRSjAMl+LB8/RdB2N0/PvLECLqGNhOzhO3T6GhfpVAbo0f OadJ0iojj6wykJg/XzRYK3n18upfh0JKQfbXH0ymyBucZxr8wBK+xBvIgI4dWTRwdnD9 oPqA== 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=tkLh0FZVC1l01ZndeEmge2GbTRSpNuP7ms2slDapalo=; b=D68joeBUOOxpGQNCtFNnis7tI8sbN+EOa4Wr7d3NEpjdo1EivR55ShC8pa/pg6QKbS EkZYGlzOfTEOZAy6Rr/eJgu70gsi+571upUk0GxXyxukrawFTiU1uG6plqkBV/FYwR5f SPOvCg/jP+fZaZNEcj+soHnISi36RwqUFdb6H8wgCAkh8I9wNPARdhWVtOplHJ1+uUXJ rtuhY6NzwXY/OAXDlP/3SH3f5JDZAHSVXrZgMTdwNVWp/uTs/kzJOrGZOhLiHVsTgdqz if/Z8A+PRNBqRXU8dors5S/w8A6Y0nts6pRtRYZfuH5J+NkY/oyKZWKNS4lMDtHwVFkS 6Iow== X-Gm-Message-State: AOAM533mH0hvpFcpKOTdwDwurhD1Eru8BdfvVC0180PUlG26cIjIsn36 JHSiW1oAt2hEsq1zKoWeNiKnAUTu/gT7hhgw X-Google-Smtp-Source: ABdhPJyLRPHCshJLZDhJvG2kojOfYyN7kR7raWFHc4iZlAx4PxbkKSV9ueJ4U5EVYtnnfQGWnHxnVQ== X-Received: by 2002:adf:f0c2:: with SMTP id x2mr4509381wro.184.1604812666569; Sat, 07 Nov 2020 21:17:46 -0800 (PST) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id r10sm8378462wmg.16.2020.11.07.21.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2020 21:17:46 -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 10/19] sparc/vdso: Remove vdso pointer from mm->context Date: Sun, 8 Nov 2020 05:17:20 +0000 Message-Id: <20201108051730.2042693-11-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201108051730.2042693-1-dima@arista.com> References: <20201108051730.2042693-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.28.0