From nobody Sat Feb 7 21:15:21 2026 Received: from mail-yx1-f49.google.com (mail-yx1-f49.google.com [74.125.224.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8779C14D29B for ; Sun, 18 Jan 2026 17:05:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768755921; cv=none; b=bqg3PD91HTTKIiWuWt0m+FjOoAYVyh5pxOL8oQlFZVZFOiXI2P+BxOQtvoV2wnhaTCSToclH9pXEUWZJ9qQUcW2zirEPWWY96D4asXSHX/Y++FXoOSATHOTP3B+Aq3RgBrYlSzVVim1wdO47IPl9UprdQYxFt5L/dLwCrwvc07w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768755921; c=relaxed/simple; bh=tOzAUVtEi3Ebdme4tb2KZvqWjilu060bpE2Swayet+8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SqwOMntN7nc29nOKCmGqKyaecWMjKwp1KZo5Hv8CykcoXXN2I0XgrXGI9gno7p9CqlQiCBfziiYfK1PdSLut9B0K6/uj/+W8eiFaOXG8USfNGFtQ0GNqhBPoSDY8xVFa5Io2vQS1+a7a5poDniM4sUnv3Zs+C1z0QO8TVqK6T8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KPK7Xr9R; arc=none smtp.client-ip=74.125.224.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KPK7Xr9R" Received: by mail-yx1-f49.google.com with SMTP id 956f58d0204a3-649295a4a5bso278123d50.2 for ; Sun, 18 Jan 2026 09:05:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768755919; x=1769360719; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4sI8HwOcUgrZ2LjacGHyNlNCNHLAuVkSdHIDzE9IwMw=; b=KPK7Xr9R+8XmllByAY50QyfKQK5PeBW/JZBlM7XQELG1eIyrr0EtToeS4wBSqz/Y2L /Y9Bgf76quTF20gJbkhyTVTcu/9jlm6SAp9iVsfEfsyN0SxhERY78jPqoF2aneLybakV V0TFNeqsTNESJ0Bkeiu1E6S3pgcJAnbrM27RZwG2ymxAmJPmn+15Z3dZ4O2/qkEu7f/U eTeWMH63OPb66+7Xk1vVySr1NGaaGnI+vEaozaku4p4CLydxLEMzqSKgVASJYOmEDuqg q0WGJ4pRh8kPrjS+gI9NVkvNj89w8H9S/7yg/8UCe0EEQBShG02Fij0jPGDHbUsk2dtk JN6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768755919; x=1769360719; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4sI8HwOcUgrZ2LjacGHyNlNCNHLAuVkSdHIDzE9IwMw=; b=j5MUS2c7uIqxST3PGXF3IjAScg5P/IHOmnn6l9TvZvXgazXij6KOHZKtgiw9ng+ZIV DUo5zh3hXNPEryj1WHmgeiq/FCIUphldaynYd3DtXNLJ1sgghLxmpQY6AIlhnJtd4zZs 9m6ENezRdxZccc36PhU6y+2fALPuWJzeo0JCH9SdsuK+URvvr7uIC6SuCEdlUtzBH4/4 gKRal3b7/ASyGQPQTZZ5CT6WYMPk+opZ21hMLtJxROidov9yhq/HbhypYFBw37DZDOA3 azreXI09ygMjzXWmXz2XgAZDp93BCb773OrMhiHWKA+KMLdHGdQoLSiApshC21pVSpjm DvPA== X-Gm-Message-State: AOJu0YwrXQM71OsaJGxj3hL2L+p0YBA0X9OUHg9Flh/fkD6Ja+/vjAHK Qnbc9BlA+a4hrySfco4fRlwJisBS8rJdIfyukRrI5F5dL7ttqlWqZY2AwCJF X-Gm-Gg: AY/fxX5JxVHlaMcCA0A5QO5RS5JTF182NmxxfHHQ2ATZgI49R791HB/uTq1y9fI/7Rk fYVgOfT+xXUbWVmQiIMsP6NxmDj42c/us5WwQn+GH9XxHEi/O9wch4p38xXeiQ46LmlnDctRMT/ eb6zpPGOY3paqS64F8sUEKgDdFFo1ph6cqUO6EkMoWVfqB9aB3aMUCep6kX8d65DZ8rwRID2Kkk h2x6rTQqVsLw2rPdsVdT0exFj3UrhO/fbFEUr5LKBX23LqZl7azY9ERgVy21l4czGzx32hYFrqh uyI0PbfR+NhttNTajbwio2zuGwFdcbce0TXwMxLZurY4mRf4whws3rq4DKj+P59d5yEB40NsR4N IRBOuNKzHd4kxJQGAS5aoQZhwuwOSc1r6CvDAHA4R/MiacZ1P5AKK92z1gkM92pNkGBgv X-Received: by 2002:a05:690c:660e:b0:793:afc7:6b64 with SMTP id 00721157ae682-793c523d50bmr171990297b3.3.1768755919047; Sun, 18 Jan 2026 09:05:19 -0800 (PST) Received: from citadel.lan ([2600:6c4a:4d3f:6d5c::133d]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-649170beef5sm3975802d50.18.2026.01.18.09.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 09:05:18 -0800 (PST) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , "H . Peter Anvin" , Thomas Gleixner , Borislav Petkov , Brian Gerst , Ard Biesheuvel , "Rafael J. Wysocki" Subject: [PATCH] x86/acpi: Remove indirect jump from wakeup_long64() Date: Sun, 18 Jan 2026 12:05:07 -0500 Message-ID: <20260118170507.711576-1-brgerst@gmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" wakeup_long64() is called from common_startup_64() via inital_code, so it is already running on the normal virtual mapping. There is no need to use an indirect jump since it is not switching mappings. Remove the indirect jump by embedding wakeup_long64() as an inner label of do_suspend_lowlevel(). Remove saved_rip is which is now unused. No functional change. Signed-off-by: Brian Gerst Cc: Ard Biesheuvel Cc: "Rafael J. Wysocki" Acked-by: Ard Biesheuvel --- arch/x86/kernel/acpi/wakeup_64.S | 64 +++++++++++++------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup= _64.S index 04f561f75e99..a256cdd03ab5 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -13,39 +13,6 @@ # Copyright 2003 Pavel Machek