From patchwork Mon Nov 26 10:51:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 10697979 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96D6817D5 for ; Mon, 26 Nov 2018 11:05:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 860F129757 for ; Mon, 26 Nov 2018 11:05:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77EB629820; Mon, 26 Nov 2018 11:05:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED63E29757 for ; Mon, 26 Nov 2018 11:05:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E80CD6B41D6; Mon, 26 Nov 2018 06:05:30 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DBE176B41D7; Mon, 26 Nov 2018 06:05:30 -0500 (EST) 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 B91BA6B41D8; Mon, 26 Nov 2018 06:05:30 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 74B926B41D6 for ; Mon, 26 Nov 2018 06:05:30 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id s14so11073478pfk.16 for ; Mon, 26 Nov 2018 03:05:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=FewCBDGFhmaJiIdgkfQ6VZUWTxzXWSxx8X5R3TwWDHQ=; b=c01RiHXjCPWt1fqlnhSOS5lDhlcQkr3iHuLeByRAuLuxRvSqTWNPBj2A6ABXYxMEZY Y+QPbW/jIRDKQgSKB4FOsdVNBVJUBq26T9DXyOlP7wb/kHYEpM0hBjGF79yjIFI8/1rD grHeMAwaS6uAoG37sNOfbu/chZJwilDmX/jN0N1Pg6A+Ok5LhSx6BQQVy8DIR6FvulSx uHGSue9ZKx7XFWKVbHLDVEGYqsvT3mqy9qrdvyJGu7liIQ0nv8sCRrUGvFtuGMfrQcPb Kgcv4R8/vEpJ6AklymsmQiM7qqcSav5ZRaBsjcAbZfXFRclIhZNfEUxFBK1so8Umocro 0aIg== X-Gm-Message-State: AA+aEWZxJ2dgAMNwbxEyZ+/p2B5z/PWJNsrG84jgNiYybrA0T4GuWc/8 s+v2rjYnsdlGMRskOm9GwoLT5L7TihJk3eZBWcGu82jeSGLceTkaa6YVXCWTaYV+O5UrXsx07ut F9aJ6f06Ts17seUIxJravsRZl8L1vuWf4Wni35gHUR3BOxrI5Mn96YWmGjRtm86M= X-Received: by 2002:a63:6302:: with SMTP id x2mr24249043pgb.183.1543230330092; Mon, 26 Nov 2018 03:05:30 -0800 (PST) X-Google-Smtp-Source: AFSGD/UhdHMvjjVGfutohiLQXWO60Z0OCGFnkSZRtDMfyxjCOK9OcKEQClGvAqmoUJlIBC8PucY1 X-Received: by 2002:a63:6302:: with SMTP id x2mr24248990pgb.183.1543230329440; Mon, 26 Nov 2018 03:05:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543230329; cv=none; d=google.com; s=arc-20160816; b=EghlSaaglCT3NyDMzTvxs9cCojUslUJliuWL1y0BDfweBG1BpsqkYreNYX8lkqi39O N/xx9PlSqydG7UlDVx8qnPPhf9RIonOg7mGZ74N23b4EeZJuDlHyRsdWCjsAPToN7HvS XyO2ZTSBmSBRHhF34n41Vjh/u+pIQfpreYAl/6pPDoPK/5mUULA8pDwLDuyhSIQ59Fsa O7JEPdsq4AAkj8Em2QGaoalEtkZMHTJ+O2dU8Q4SW7imTFJOJCDZsunuNAbryGH6koXD z2osdoh9mH2FGrZJhhWK0XYVoDo+j7Oa3VkU1XPVZqdPZOoo48nhA3nP2K7jw4WexAjz vNUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=FewCBDGFhmaJiIdgkfQ6VZUWTxzXWSxx8X5R3TwWDHQ=; b=LyO/Gv0MBPkaqRWva46Bc6p4Ih+YRGf3joWsjzjl6hTTn0zmQV5QF7D/m10bH+T9lF wf8UoTrQ7ZRG/UmvoJSZeEeY+WDetbV/GE/KV80YR08b8yxhQ9sdnLaDWECaU0S2J0JE Z3aLbmp52Iv0oAq6Z59r2qhh+VBmi8SaKRnC4q53bLGlbGXEjQ+2r+/mOTHXqziRtxxA g2kG13E5kVMRplCEHDbmZU89Ir11PIRFU93cEPRzbG3fjN+K0QLngpqvcadk+NyfPxe2 zcVaUg66xJDVxeydMCtvTbBDo45zLqGbs5+4Xi1PCAvIz0mqsO+gv6nHbTFN8xRZfSoL aSKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="mpYZcl/2"; spf=pass (google.com: domain of srs0=uhmk=of=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=UhMK=OF=linuxfoundation.org=gregkh@kernel.org" Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id d12si20401600pla.351.2018.11.26.03.05.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 03:05:29 -0800 (PST) Received-SPF: pass (google.com: domain of srs0=uhmk=of=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) client-ip=198.145.29.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="mpYZcl/2"; spf=pass (google.com: domain of srs0=uhmk=of=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=UhMK=OF=linuxfoundation.org=gregkh@kernel.org" Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 80CAB21479; Mon, 26 Nov 2018 11:05:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543230329; bh=99Jz98kxONQsk5T+TYP8sQqleGggScHd8CpMM+dDOG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mpYZcl/2U6OxblTeCdTUKAm5G84mmALpQjqy3md1LX6H4TRrGcZdxc2lSTwSBPjhF 8Alvrrh0gywLDA1gFUaU8MkA1y1kmGh5U9/2MaQI4Jz8YTCYulstrpHpNB7FLb/DWP P27Nb8vlWo9RulWnQN8q3YIdlMh178W0WS4Xk/5o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Kirill A. Shutemov" , Thomas Gleixner , Andy Lutomirski , bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, peterz@infradead.org, boris.ostrovsky@oracle.com, jgross@suse.com, bhe@redhat.com, willy@infradead.org, linux-mm@kvack.org, Sasha Levin Subject: [PATCH 4.19 094/118] x86/ldt: Remove unused variable in map_ldt_struct() Date: Mon, 26 Nov 2018 11:51:28 +0100 Message-Id: <20181126105105.473322783@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181126105059.832485122@linuxfoundation.org> References: <20181126105059.832485122@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ commit b082f2dd80612015cd6d9d84e52099734ec9a0e1 upstream Splitting out the sanity check in map_ldt_struct() moved page table syncing into a separate function, which made the pgd variable unused. Remove it. [ tglx: Massaged changelog ] Fixes: 9bae3197e15d ("x86/ldt: Split out sanity check in map_ldt_struct()") Signed-off-by: Kirill A. Shutemov Signed-off-by: Thomas Gleixner Reviewed-by: Andy Lutomirski Cc: bp@alien8.de Cc: hpa@zytor.com Cc: dave.hansen@linux.intel.com Cc: peterz@infradead.org Cc: boris.ostrovsky@oracle.com Cc: jgross@suse.com Cc: bhe@redhat.com Cc: willy@infradead.org Cc: linux-mm@kvack.org Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20181026122856.66224-4-kirill.shutemov@linux.intel.com Signed-off-by: Sasha Levin --- arch/x86/kernel/ldt.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index 2a71ded9b13e..65590eee6289 100644 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c @@ -207,7 +207,6 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) bool is_vmalloc; spinlock_t *ptl; int i, nr_pages; - pgd_t *pgd; if (!static_cpu_has(X86_FEATURE_PTI)) return 0; @@ -221,13 +220,6 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) /* Check if the current mappings are sane */ sanity_check_ldt_mapping(mm); - /* - * Did we already have the top level entry allocated? We can't - * use pgd_none() for this because it doens't do anything on - * 4-level page table kernels. - */ - pgd = pgd_offset(mm, LDT_BASE_ADDR); - is_vmalloc = is_vmalloc_addr(ldt->entries); nr_pages = DIV_ROUND_UP(ldt->nr_entries * LDT_ENTRY_SIZE, PAGE_SIZE);