From patchwork Tue Dec 11 19:55:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1011352 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-98232-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="ftd5y6F+"; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="dhl6FPTq"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43DrLL5grZz9s9G for ; Wed, 12 Dec 2018 06:56:42 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=V71s48ORMCnXhfmUR/XaGMumwDTyHAZ CnCmsodVlkza9Z8eVZPX5WWVS2T2+BjoKu0hQNhxu6Erm+gWAZX6PFGK17e3XEpw r11XsRFoZHeD/5k5Di4SE6/Cg4+4kVVGqKs7d3XVeC2l06JYbcWyEOxX4I96eImw VPQBpaUTx+78= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=xW1EtsKlscVredF4h/0PVDnWyf8=; b=ftd5y 6F+TDTRQmvxYpfL/Kc2AlxTFcV6ZP7XYv+IK3StC85PJ4YWFlyCHPtT4xOZVP75V aPW/F7JZdi5dKp8heU5+L08pvG6DqcctXI+V/P03nK7rexIbQcgia6MgLuvaH7xk sGNcA5PQirppucweLSDvjjdB0KLsNJMht0BtLw= Received: (qmail 72128 invoked by alias); 11 Dec 2018 19:56:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 71968 invoked by uid 89); 11 Dec 2018 19:56:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=act X-HELO: mail-qk1-f196.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=pTg/WszlcDFxFRc2viUpIz5JslRt2tRt/dPuiXmUNNs=; b=dhl6FPTqVDq9JjA5iBXVH50KN73riFIe49hFCH8SF6JexeQx1GnbOnX2jMUoT3Y7Sv NvtMXf3woTf6ix9Xaetqk+eG+gFCI1a/mxgKqeJhkCD29keLIMh/64AV+a9GnClmWOEw 0WAU8Aq+tsGwYhhj3qp0HhrimxWNmmW0Pv56M= From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 5/5] s390: Use generic kernel_sigaction.h Date: Tue, 11 Dec 2018 17:55:54 -0200 Message-Id: <20181211195554.3377-5-adhemerval.zanella@linaro.org> In-Reply-To: <20181211195554.3377-1-adhemerval.zanella@linaro.org> References: <20181211195554.3377-1-adhemerval.zanella@linaro.org> S390 kernel sigaction is the same as the Linux generic one. Checked with a s390-linux-gnu and s390x-linux-gnu build. * sysdeps/unix/sysv/linux/s390/kernel_sigaction.h: Use Linux generic kernel_sigction definition. --- ChangeLog | 3 ++ .../unix/sysv/linux/s390/kernel_sigaction.h | 28 ++----------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/sysdeps/unix/sysv/linux/s390/kernel_sigaction.h b/sysdeps/unix/sysv/linux/s390/kernel_sigaction.h index 7a6a2c4f29..18000a62cc 100644 --- a/sysdeps/unix/sysv/linux/s390/kernel_sigaction.h +++ b/sysdeps/unix/sysv/linux/s390/kernel_sigaction.h @@ -1,30 +1,6 @@ -#include - +/* S390 uses the generic Linux UAPI but defines SA_RESTORER. */ #define SA_RESTORER 0x04000000 - -/* This is the sigaction structure from the Linux 3.2 kernel. */ -struct kernel_sigaction -{ - union - { - __sighandler_t _sa_handler; - void (*_sa_sigaction)(int, siginfo_t *, void *); - } _u; -#define k_sa_handler _u._sa_handler - /* The 'struct sigaction' definition in s390 kernel header - arch/s390/include/uapi/asm/signal.h is used for __NR_rt_sigaction - on 64 bits and for __NR_sigaction for 31 bits. - - The expected layout for __NR_rt_sigaction for 31 bits is either - 'struct sigaction' from include/linux/signal_types.h or - 'struct compat_sigaction' from include/linux/compat.h. - - So for __NR_rt_sigaction we can use the same layout for both s390x - and s390. */ - unsigned long sa_flags; - void (*sa_restorer)(void); - sigset_t sa_mask; -}; +#include #define SET_SA_RESTORER(kact, act) \ (kact)->sa_restorer = (act)->sa_restorer