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 6771E144D16; Thu, 13 Jun 2024 11:54:38 +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=1718279678; cv=none; b=MUMoiaY4+dP/r3UmCp3XoBHmsiNNFgFF8OuOFPQCNk1v6F4NuL53BSi82r2Dlyjfmccq+K8BKJjJuuiSXEFxBfbTt3Lfx1Y8bwWrZFl1bMbQ9b69Cqpw8KELlV4J4vOKTav9sZtXjlaOQsA4MTpZ5w7PricaULwmPIlr1c1UozA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718279678; c=relaxed/simple; bh=bZTKvzvLumHBRv3eQaN1SAANr3NR0tmyy2UdIGhaS0U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H5bOV9OwMFEkmlQlpokmekh2jN/orXzXYt/GdGVIcOdE0kYLYCjw0HqmGur8eSxV/+LYYL6Mw1vckSv0Kp4wgaLUcYD+AgoZR5RV4zZrD7jszl1HbLPcI+j4s8kWhgdKPlLkN4jHVe0p5wfBVga/RmeM2mUl4HFwNSgs4gXxqy8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Bp8aCMJp; 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="Bp8aCMJp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3DABC2BBFC; Thu, 13 Jun 2024 11:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718279678; bh=bZTKvzvLumHBRv3eQaN1SAANr3NR0tmyy2UdIGhaS0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bp8aCMJpU/Cf9w7/b8eduUIm/tsTzV87GkpyIpftI3XAPdxH4ngOQCXG5zy9pCC2F ogJAOXMaqG4Nf/PMMGqExnnFreOSs/r2E+htOvX0h9F9lUXIKuI4iL2096dixPJqrA QkYTyqIWOw7KmoFSlwDyn1dxi7sgFFjeJK+DK7xI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Helge Deller Subject: [PATCH 6.9 126/157] parisc: Define sigset_t in parisc uapi header Date: Thu, 13 Jun 2024 13:34:11 +0200 Message-ID: <20240613113232.284365583@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113227.389465891@linuxfoundation.org> References: <20240613113227.389465891@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-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;