From nobody Sat Feb 7 12:40:31 2026 Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) (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 E090F134CC8 for ; Thu, 21 Mar 2024 21:18:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711055935; cv=none; b=a5HTZ6crD56q9nYNgWfJpa9WjGE/m8cWHFzWO2RmAt1/JsFbhnrAw2anMjib+tf02y9PcPMMo7+8/NLcDvTv4jCZKcaw7sRJwtBmvA5GDoyTEAaj8RNmKiIp5gdETMPTB4muVa3pGnSdNup6f8Hw71VxucUmYfmamMcWvViqWM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711055935; c=relaxed/simple; bh=CYkv0TCyFL7OBmpy0U15hldM8fnkJttzHPnQdaHZlOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DAVbmhYAW5uy2HF5Os58Qx1Nus3c65MD/9FBoWcYA9tLOL7hQwUn4TIz1hRGLfyApuR9B/s6S5fRBnoFEWjJdaYbCXRM9WGeTlxIZdBfy7L1BhHi0T1q0vIjYpth0UOVqp0bdruDtUaaxC2uZjL2PIfSlhjOiFhNf7s7ZW4Qq1A= 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=lzCpdDkm; arc=none smtp.client-ip=209.85.167.169 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="lzCpdDkm" Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3c3ae8fa863so662084b6e.2 for ; Thu, 21 Mar 2024 14:18:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711055932; x=1711660732; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=raksvTX6hatlvAyAefZzTCWGZczeDpaAiGLw02+PuGQ=; b=lzCpdDkmdTjHh4GvCv+u/YLFCE05fDDDE7/Q5a68+4HMxQiWtPcNgfmMONue9idD5w YvmNdW38CAgENB72lYLzW7+mft+nEuluEM00GDBKbFBhL5ePWO3dH8KuhGL7AkVI5Wv6 5kZVFRYwDcXNBBjv4Mpej1BhVgiPbkNE7SAV27dSYZQn6tvwKPdRkzm1OGjEch9n3dET wPuUv0EEt+3yhqR3SRnaH3wLPlMuFkE1PrsUahxzm/wJjDGD6JUdKv9MqLWA1RFc4//5 dBQNh7zgrcwNIvZFYKBIzS6DHdSu4MX8FQJGrEP9AG/b+zkeR8yYWzyfsG2KpX/qkDly xcMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711055932; x=1711660732; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=raksvTX6hatlvAyAefZzTCWGZczeDpaAiGLw02+PuGQ=; b=Nh0F+cEoUx1rfd0k2X4f0kM+9F4AMy9oI4K+ZgOb5XlBGlrHD5a/8Y5LT1lvgXkCvF Xr5Jls5DnOplfDZMlHD55tF8aqzFUJsbj0lJxRwlp3bHRlLpx9TDCgXSTjCKndjIHf0a FP+pzH3Ge/hXUAz8FrITh577E8U1OJj9Cai3Cu5W695mBU78+HytoBbEChFfjGoE1jEF cB1Ax3DbZqnE2Da2AEao09Xr60dz33uN2sur2WroJBQRRJshh7RHGa9LbwHBFSKHxwYc VjFKA06Fo1eD3OgL+myfzPL982civ5crvftFaYEtrzCWs1avLoceIKtSqm+Ts04usR9a OpyQ== X-Gm-Message-State: AOJu0Yx6s7NIKKWUxFPSG2FjlMSSvV08J5CtkKxwY1s37f1pn7gXMJoZ phcgKrMO9s2J2ja9dMNovC2a0sjhzMuTu0I1iSWyW8vWCbdIaNl5snVZs/M= X-Google-Smtp-Source: AGHT+IEkJeupmSX2IYC77RmdChsdUGYZ4PRRMalm3JIoEs0IWX6DMzDTzGh/XUScjutl5xcdad7zXw== X-Received: by 2002:a05:6808:1289:b0:3c1:f573:b68c with SMTP id a9-20020a056808128900b003c1f573b68cmr645701oiw.30.1711055932083; Thu, 21 Mar 2024 14:18:52 -0700 (PDT) Received: from citadel.lan (2600-6c4a-4d3f-6d5c-0000-0000-0000-1019.inf6.spectrum.com. [2600:6c4a:4d3f:6d5c::1019]) by smtp.gmail.com with ESMTPSA id gs7-20020a056214226700b006961cdc3f7csm304903qvb.85.2024.03.21.14.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 14:18:51 -0700 (PDT) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , Thomas Gleixner , Borislav Petkov , "H . Peter Anvin" , Brian Gerst Subject: [PATCH 1/2] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR Date: Thu, 21 Mar 2024 17:18:46 -0400 Message-ID: <20240321211847.132473-2-brgerst@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240321211847.132473-1-brgerst@gmail.com> References: <20240321211847.132473-1-brgerst@gmail.com> 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" Signed-off-by: Brian Gerst --- arch/x86/include/asm/ia32_unistd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32= _unistd.h index aa065c94ccf5..7bcb82951c11 100644 --- a/arch/x86/include/asm/ia32_unistd.h +++ b/arch/x86/include/asm/ia32_unistd.h @@ -6,7 +6,6 @@ * This file contains the system call numbers of the ia32 compat ABI, * this is for the kernel only. */ -#define __SYSCALL_ia32_NR(x) (x) #include =20 #endif /* _ASM_X86_IA32_UNISTD_H */ --=20 2.44.0 From nobody Sat Feb 7 12:40:31 2026 Received: from mail-vs1-f44.google.com (mail-vs1-f44.google.com [209.85.217.44]) (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 57177135A7C for ; Thu, 21 Mar 2024 21:18:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711055936; cv=none; b=Q6M7LOWxmWPiCIrQd2upvWUu9dBwo2KlY5dBK4YCWUjAeqt8fd2BayaIyTVSncivYz5hfM+mvkI6XOnscbu5rw0+hwQ6JOYOf8IZztKK5umhPilK2+kUl+mhvGg7NvG8CZY580NqC1fhUY6ALubHI7iKEvc5HBvsPVovT47/IiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711055936; c=relaxed/simple; bh=6SncT2xHQVsN3uYWdyB3MAV/FUGjtqsa2MWM+AyiGoE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N0I1XywjstHRW5CrQ3HaJA72/WIto7Mv3J2w4Hkfknix7JEbBsAqmGfLg/s6PWZGJC+BHr8oBlkgqYd2o86SsWa5JL6tB9XSmFxfbu81W0gljrz/FKID0XKzEo1U8M2st06I5/8anGLu1tXuHghf2U15AKAPLM9pmOB+UDLXJPY= 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=Vt9M+rxE; arc=none smtp.client-ip=209.85.217.44 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="Vt9M+rxE" Received: by mail-vs1-f44.google.com with SMTP id ada2fe7eead31-4727b9d7b1fso148802137.1 for ; Thu, 21 Mar 2024 14:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711055933; x=1711660733; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m536zU+Ql7UMC3jfupH+HQpHMUR1QBM11u8xquMxNgk=; b=Vt9M+rxE2PVYuPALvBz+9IDI5/S/9r7JtHVkraVjEoB1yFnjed7wOBs6NMKgXANh55 yLtY+7B8G27C7aGUj2ypA7PZxotP+S7kSfCTv5LgNiNo6ZQaBwydJwXp3IvyIP3W4mzc wezZk8fYXv3vjtAQMU/kTVAdgEXBBBZbRFo3XdBL7AoOwXmYDo9O8mVbcP1R45s4sD8j 4LTH1JmrzeOxSESrRiy4XGqsrKdbtvnrjNXyQmRToz5/MR75Z5ugZHXybRgK57EU1+KF OzhFyLwGru777JeiYZDYGixCa411/m2D/hEpJheMO6lo/j1BZm6IVIUKhE5yavpH2UTl kTPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711055933; x=1711660733; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m536zU+Ql7UMC3jfupH+HQpHMUR1QBM11u8xquMxNgk=; b=kpv5cW1AKTdKTms97fmp6x1Qp6zCvh4Vm5Am7tp/hxe6krFoo9VQOZb7mKseS1ovhL w96CRcN6GRnDDNr8ly5/QcwrWU6s9P4UO8qWNdsZztrhEgaCXaNOJjxayi94TO3YBydP 60wNL/vrol6z+R3/yt4pfkcD+qGFpfIDPxEVr6ekJFWD3IImbhUo4LdYIZsltEw6qFQV Y5VDWK2N+/2uphAqvAu4QajZJzu6Oa7J6QHmRae2zQl+oiL4AZ3FV0E5wk/5iZAdSqRR ugQ5OC0TxQJexv2sOPXM2lrZwIqNVZZGrtyIVOxpPYifXJoGUKLq2MLujHCvAMqz0RF5 e96Q== X-Gm-Message-State: AOJu0Yx+Qm47an7EsZIcmdpZDe45MH0NVX2hV7Vatr35YjZxplLQmtYs FpoyzZ7wmxpVgCOl1BF9EvRvC0NCVxC6WRTR+wRjYNJlYCe5Zgj3ufVmVEQ= X-Google-Smtp-Source: AGHT+IHyNPjsDXQagST7CTkdGw8YNDbD2bvIttXtqno9fzpxybO8vKGN7xGWjd10kwQLrlGOd34SSQ== X-Received: by 2002:a05:6102:508a:b0:474:c306:9062 with SMTP id bl10-20020a056102508a00b00474c3069062mr1044686vsb.12.1711055933444; Thu, 21 Mar 2024 14:18:53 -0700 (PDT) Received: from citadel.lan (2600-6c4a-4d3f-6d5c-0000-0000-0000-1019.inf6.spectrum.com. [2600:6c4a:4d3f:6d5c::1019]) by smtp.gmail.com with ESMTPSA id gs7-20020a056214226700b006961cdc3f7csm304903qvb.85.2024.03.21.14.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 14:18:52 -0700 (PDT) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , Thomas Gleixner , Borislav Petkov , "H . Peter Anvin" , Brian Gerst Subject: [PATCH 2/2] x86/syscall/compat: Remove ia32_unistd.h Date: Thu, 21 Mar 2024 17:18:47 -0400 Message-ID: <20240321211847.132473-3-brgerst@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240321211847.132473-1-brgerst@gmail.com> References: <20240321211847.132473-1-brgerst@gmail.com> 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" This header is now just a wrapper for unistd_32_ia32.h. Signed-off-by: Brian Gerst --- arch/x86/entry/entry_64_compat.S | 1 - arch/x86/include/asm/ia32_unistd.h | 11 ----------- arch/x86/include/asm/seccomp.h | 2 +- arch/x86/kernel/signal_32.c | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 arch/x86/include/asm/ia32_unistd.h diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_com= pat.S index eabf48c4d4b4..49cc4b8cfbb5 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32= _unistd.h deleted file mode 100644 index 7bcb82951c11..000000000000 --- a/arch/x86/include/asm/ia32_unistd.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_IA32_UNISTD_H -#define _ASM_X86_IA32_UNISTD_H - -/* - * This file contains the system call numbers of the ia32 compat ABI, - * this is for the kernel only. - */ -#include - -#endif /* _ASM_X86_IA32_UNISTD_H */ diff --git a/arch/x86/include/asm/seccomp.h b/arch/x86/include/asm/seccomp.h index fef16e398161..42bcd42d70d1 100644 --- a/arch/x86/include/asm/seccomp.h +++ b/arch/x86/include/asm/seccomp.h @@ -9,7 +9,7 @@ #endif =20 #ifdef CONFIG_COMPAT -#include +#include #define __NR_seccomp_read_32 __NR_ia32_read #define __NR_seccomp_write_32 __NR_ia32_write #define __NR_seccomp_exit_32 __NR_ia32_exit diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index c12624bc82a3..ef654530bf5a 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c @@ -34,7 +34,7 @@ #include =20 #ifdef CONFIG_IA32_EMULATION -#include +#include =20 static inline void reload_segments(struct sigcontext_32 *sc) { --=20 2.44.0