Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp530379ybc; Sat, 16 Nov 2019 04:05:13 -0800 (PST) X-Google-Smtp-Source: APXvYqwXNfIdcNTSZPB4CiP9QGXkhdIfLN0Z6ioVezZeRV5xAP0M9eFfqFKrx/0cLjKz3zI/s1zm X-Received: by 2002:a17:906:22c9:: with SMTP id q9mr9155180eja.198.1573905913300; Sat, 16 Nov 2019 04:05:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573905913; cv=none; d=google.com; s=arc-20160816; b=Z51bLHAOp3fCG4fYZjn+Yp1tBr0oFgMwvufHhywcfU/ML01WU58OSrFzYxe18p2+oY N9NeyIxH45PqtPoiAyTOTni+DrW3iw1JLIzCj7fJI0OtIiJmzZKzgWBoeY3l8EGLybVE f0W7NUPtYrUUrPouT6S85/a1zK7WiJT/CExMjuJBh7krgC5lqykSamirIQV4M/M7PVAf VA3KYyAlybtT9CUcMZ36Hlh2uTjOqpykDv/V6QvR14x3gItI0U6VLzQPo44ajasbrqNy OK1WXBYNN7Je7IfXDxS1gGU4lhvqtVC4ggZZrP4n6Cx1Fh3KVlcDpZdVhUMspj0vwjHA 5lgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=w3ETabjjeJBYnjEtE6rUhY9QJbHo0MoB1UeuwWYRmaI=; b=1BNPAhaSmIdQH/xK4mnVmWgqGsainArUCNfOkZ7koa54X4VNvJR7mI52EghA2AsF5Y Uv8mio7MeiLp9/cRSFQ7yv5w3NEihjbnD6vtokAM/7CI8lvzF5ELBng2m2xhfhLmcxIR mVY/kzeHdNw2yNQTgHiW28ehl3wfnTS6fFUwadEvY87QwpbZA9u35WLtP6HLi6vQphTA 5R4Byy7nofbSddt7TsNEila3BAKUu9tRfgfI84mINO+jnnPqkV7TBN+l+LTnTVz+ml5Q pPbRCU/9Y0wvSUzRUvs39W/FtPFmybLX449iZBdPFclU0dG4o0HNXZNdQwW3O/ihX22G WRNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h15si7750781ejt.387.2019.11.16.04.04.48; Sat, 16 Nov 2019 04:05:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727557AbfKPMDB (ORCPT + 99 others); Sat, 16 Nov 2019 07:03:01 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:45319 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726794AbfKPMDA (ORCPT ); Sat, 16 Nov 2019 07:03:00 -0500 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1iVwmn-0002XZ-KN; Sat, 16 Nov 2019 13:02:41 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 3869D1C190B; Sat, 16 Nov 2019 13:02:41 +0100 (CET) Date: Sat, 16 Nov 2019 12:02:41 -0000 From: "tip-bot2 for Thomas Gleixner" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/asm] x86/entry/32: Remove unused resume_userspace label Cc: Peter Zijlstra , Thomas Gleixner , Sean Christopherson , Alexandre Chartre , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org In-Reply-To: <20191023123117.686514045@linutronix.de> References: <20191023123117.686514045@linutronix.de> MIME-Version: 1.0 Message-ID: <157390576119.12247.2366713267971139294.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/asm branch of tip: Commit-ID: df1a7524741b6c094786032e12a21a448321d9f6 Gitweb: https://git.kernel.org/tip/df1a7524741b6c094786032e12a21a448321d9f6 Author: Thomas Gleixner AuthorDate: Wed, 23 Oct 2019 14:27:06 +02:00 Committer: Thomas Gleixner CommitterDate: Sat, 16 Nov 2019 12:55:55 +01:00 x86/entry/32: Remove unused resume_userspace label The C reimplementation of SYSENTER left that unused ENTRY() label around. Remove it. Fixes: 5f310f739b4c ("x86/entry/32: Re-implement SYSENTER using the new C path") Originally-by: Peter Zijlstra Signed-off-by: Thomas Gleixner Reviewed-by: Sean Christopherson Reviewed-by: Alexandre Chartre Acked-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20191023123117.686514045@linutronix.de --- arch/x86/entry/entry_32.S | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index a987b62..4bbcc5e 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -824,7 +824,6 @@ ret_from_intr: cmpl $USER_RPL, %eax jb restore_all_kernel # not returning to v8086 or userspace -SYM_INNER_LABEL_ALIGN(resume_userspace, SYM_L_LOCAL) DISABLE_INTERRUPTS(CLBR_ANY) TRACE_IRQS_OFF movl %esp, %eax