From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5EBF61C32; Thu, 13 Jun 2024 12:50:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718283031; cv=none; b=cN69qXHoGIvd0hsxZMncEeuZ3DznS7nqoOx7B1PeZUNWdOH/FCmIJYo1YAIeAJmz51epsZSf1F0Xp/ux2HDFUWQzVSBkwmIFYiwKY4VH8GwdbHxr5GUjkaAKP2mkJduExdyYaQqcpcTmwZVEQW/Dr3l4ataZ3AYJMGVndSlRs2U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718283031; c=relaxed/simple; bh=PgFWK3FdAIsZ/Ess6L4KIwCPORBYhvUayJhoorn5hy0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FAyFPYUJnVKwGSAimLu/uOeJhGFOp6WZ4/cRETlJK+uGJf6CR7aozMzQ2rtnNPDW0IbzT13CJHqHG850aUQaQoXv4edoku+xKfLU7krW9jht6tZBUO4y+HIcP22EumwRhgtgOp5AZOqZzziiOFJbdh5a0kFtgHCTwk4YYW/5nlA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Oj7sXmIZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Oj7sXmIZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAAFAC2BBFC; Thu, 13 Jun 2024 12:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718283031; bh=PgFWK3FdAIsZ/Ess6L4KIwCPORBYhvUayJhoorn5hy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oj7sXmIZv5JWq+8yIkk2coUjdO1LwaJyhT40Ni2Hk11p2mk6L6W6CY/6SelgT0kCj nna3BKhUImJEgldzhXRJdKCHS+Zd1excyrTNhlV+MsJlT1gdqRTL6xYQqTLc3kZySM cqaDUvcqOuijOJO7Jl9vEcHeG3IRcgD7Zlv4jtQY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Helge Deller Subject: [PATCH 6.1 75/85] parisc: Define sigset_t in parisc uapi header Date: Thu, 13 Jun 2024 13:36:13 +0200 Message-ID: <20240613113217.030905818@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113214.134806994@linuxfoundation.org> References: <20240613113214.134806994@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Helge Deller commit 487fa28fa8b60417642ac58e8beda6e2509d18f9 upstream. The util-linux debian package fails to build on parisc, because sigset_t isn't defined in asm/signal.h when included from userspace. Move the sigset_t type from internal header to the uapi header to fix the build. Link: https://buildd.debian.org/status/fetch.php?pkg=util-linux&arch=hppa&ver=2.40-7&stamp=1714163443&raw=0 Signed-off-by: Helge Deller Cc: stable@vger.kernel.org # v6.0+ Signed-off-by: Greg Kroah-Hartman --- arch/parisc/include/asm/signal.h | 12 ------------ arch/parisc/include/uapi/asm/signal.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 12 deletions(-) --- a/arch/parisc/include/asm/signal.h +++ b/arch/parisc/include/asm/signal.h @@ -4,23 +4,11 @@ #include -#define _NSIG 64 -/* bits-per-word, where word apparently means 'long' not 'int' */ -#define _NSIG_BPW BITS_PER_LONG -#define _NSIG_WORDS (_NSIG / _NSIG_BPW) - # ifndef __ASSEMBLY__ /* Most things should be clean enough to redefine this at will, if care is taken to make libc match. */ -typedef unsigned long old_sigset_t; /* at least 32 bits */ - -typedef struct { - /* next_signal() assumes this is a long - no choice */ - unsigned long sig[_NSIG_WORDS]; -} sigset_t; - #include #endif /* !__ASSEMBLY */ --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h @@ -57,10 +57,20 @@ #include +#define _NSIG 64 +#define _NSIG_BPW (sizeof(unsigned long) * 8) +#define _NSIG_WORDS (_NSIG / _NSIG_BPW) + # ifndef __ASSEMBLY__ # include +typedef unsigned long old_sigset_t; /* at least 32 bits */ + +typedef struct { + unsigned long sig[_NSIG_WORDS]; +} sigset_t; + /* Avoid too many header ordering problems. */ struct siginfo;