From patchwork Sat Aug 22 05:10:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 11730911 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E23D16B1 for ; Sat, 22 Aug 2020 05:11:00 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 56F522072D for ; Sat, 22 Aug 2020 05:11:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DtKGhDkO"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Zl8VQ73f" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56F522072D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LmTetuWZTb9PfqtJ1keYyABkAC58ci3+QvJbRe2Vd8c=; b=DtKGhDkONmfFWAE/ScFEu2qir YdEMqmjPVDMZcKWRaWI1MTTQ5DDuQuiLu0m476bN49Tu9PIDxnPFEUdAnKtloidMNA+Mz1ga4UhjS s7Q7XjmgI/MX/W65cPYLMeGZzhDFla0Xtku/ME7xO58hEfnYnuVF2ZDvNcbfp9WyHzx69kSSlUAzS 67PKJOWKQSTZhIZgq7AjZF2KhxVFcvExTOuRszxJHksiKOsXN9NcilYuZhrcg7/0ruykDiEs+0pKY vXqbjY307oAPp0M0vohczWcL3ApplYLnRT9n6h0CXYl4ZCzZcdtP0woZMWT29a8PiR+ujmEGLVtGV rP1UsIHaA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9LnZ-0007Tj-0m; Sat, 22 Aug 2020 05:10:37 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9LnV-0007Sk-Ul for linux-arm-kernel@lists.infradead.org; Sat, 22 Aug 2020 05:10:35 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id e12so4362609ybc.18 for ; Fri, 21 Aug 2020 22:10:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=dHvj1iKs0moCQmfMOLtWQThMXTt6DvaOrave3mL0FWI=; b=Zl8VQ73fPg2962wC3F6UIc9LACbeVCWJ376aaapfi4hIwdD84ENJv6DWi6qpZ4ZtQO eU8s8LO0KZ1gWzqLJZuRpo+2ZsVwBTnmn5Bl8DbAFtIezRO+bPIRfOuutWTzHoPveZQR a5ymC1qkkU8A6rE26nLCbg9lqDmbAEuyd83uCKzOtimh9AY/JFvIKVTGxqaeXoUJChIg P/n2iP39TkMbOz2M2+CWTczJhweP0+TnXuuuMIEOnB4xVSc1CHhbOZLd0Ow36iHt71aC k942fBvVrtBeDs2Q7VfDuun8NCldVnDMSSYor952JYgulamWsqWRpFLkhuWZ0pjO80+V VCNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=dHvj1iKs0moCQmfMOLtWQThMXTt6DvaOrave3mL0FWI=; b=iki08diio+dEDBY7NIzybhFHPDsva/msQOuzuM0ubpyiOnKCvAbu86LT9j/yc0LYBh IoPHJp8fW44ADrzpDmhUsKcjPwvZGn70Y6W0AKpgDKP16GFNPFPlThtQ7E9uDXlgqxFm qKNBAz07bXVQYNzKArgPN8IsBf+Pyh34lbwj9eFoNyRx/dHiwj0XjXvNypaWS7b+3g8C 50NhWSy0RBDpY1m6LVSglu4xzq1x09i1wbTU/I7YZLEGuHxghLZVIs2mimJHEzPNCVwF r4eVlyKkYIolso8IqtEUbrdSCTyWdK8LMzkNX8/Egx8+Fk4dxqe+W+eMWGm5QCtKONkX kjFQ== X-Gm-Message-State: AOAM532QucvCep/a0sDznQxofvMOMknY/O7GtYL7TiabjUaQYjusfsKv gGkUE31yTekQJymcz5DJN5HZxZM= X-Google-Smtp-Source: ABdhPJyMMY0gYwn76duYMa/vKZXGobx29XUIVwrXBZ+xukoOdJnb98lTpXhY6/UMFaPwasVrHGlJMsQ= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:0:7220:84ff:fe09:385a]) (user=pcc job=sendgmr) by 2002:a25:7a42:: with SMTP id v63mr7972338ybc.4.1598073028810; Fri, 21 Aug 2020 22:10:28 -0700 (PDT) Date: Fri, 21 Aug 2020 22:10:11 -0700 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog Subject: [PATCH v10 1/7] parisc: start using signal-defs.h From: Peter Collingbourne To: Catalin Marinas , Evgenii Stepanov , Kostya Serebryany , Vincenzo Frascino , Dave Martin , Will Deacon , Oleg Nesterov , "Eric W. Biederman" , "James E.J. Bottomley" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_011034_043606_3F1BD5E8 X-CRM114-Status: GOOD ( 11.53 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:b4a listed in] [list.dnswl.org] -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-parisc@vger.kernel.org, Andrey Konovalov , Kevin Brodsky , David Spickett , Peter Collingbourne , Linux ARM , Richard Henderson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org We currently include signal-defs.h on all architectures except parisc. Make parisc fall in line. This will make maintenance easier once the flag bits are moved here. Signed-off-by: Peter Collingbourne --- View this change in Gerrit: https://linux-review.googlesource.com/q/If03a5135fb514fe96548fb74610e6c3586a04064 arch/parisc/include/uapi/asm/signal.h | 9 +-------- include/uapi/asm-generic/signal-defs.h | 6 ++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index d38563a394f2..92a1c7ea44b4 100644 --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h @@ -69,14 +69,7 @@ #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 - -#define SIG_BLOCK 0 /* for blocking signals */ -#define SIG_UNBLOCK 1 /* for unblocking signals */ -#define SIG_SETMASK 2 /* for setting the signal mask */ - -#define SIG_DFL ((__sighandler_t)0) /* default signal handling */ -#define SIG_IGN ((__sighandler_t)1) /* ignore signal */ -#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ +#include # ifndef __ASSEMBLY__ diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h index e9304c95ceea..ecdf6312bfa5 100644 --- a/include/uapi/asm-generic/signal-defs.h +++ b/include/uapi/asm-generic/signal-defs.h @@ -15,8 +15,14 @@ #endif #ifndef __ASSEMBLY__ +#ifndef __hppa__ +/* + * These have a special definition on parisc, see: + * arch/parisc/include/uapi/asm/signal.h + */ typedef void __signalfn_t(int); typedef __signalfn_t __user *__sighandler_t; +#endif typedef void __restorefn_t(void); typedef __restorefn_t __user *__sigrestore_t;