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 X-Patchwork-Id: 153514 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1024299ljp; Tue, 11 Dec 2018 11:56:46 -0800 (PST) X-Google-Smtp-Source: AFSGD/X6YeDiLmVFBiC0ZJKH3F9ZJrW867Y0QaWMWj4Z/qzJDlwPRuL0JJQORnn4RYsXjspBJ91l X-Received: by 2002:a63:ed15:: with SMTP id d21mr15641285pgi.305.1544558205997; Tue, 11 Dec 2018 11:56:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544558205; cv=none; d=google.com; s=arc-20160816; b=NeIZf/kQW4ZUwHEbCx+Y2QUCaknLjkpYe17QT2uxJzvMG7sGq9m1FRkKqqoykLr+Jf BUHKVlKNGztpGfq0qpG7mggIBXXirmIKhFVLoxewxedDK7boyrcYXy2yxT2SUznileCS FrsDd3m6IU6eofMc6ex9IQIsuGKVv2Vgy/Gsl0IHyjtbRtxne9FbMJf5jZGTkuoCcdXD PJNBHtem/2FU/ks2HKF8ip7lEL26CN9MQQgJ8FR/kFcoq8AL4RbHKicPdLvZcrO1G4be S9tE4cfYk+gFbiuy+f2vs/3OWpqonMV2Ot4nJX0S1DCwfu1ULWFHItgLfJGzQU8cOXhi 5hmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=pTg/WszlcDFxFRc2viUpIz5JslRt2tRt/dPuiXmUNNs=; b=kCAoRDVSkuvjS3SbcPSyqmRqsG1QhTQRD8PS10j/fEdxZphBcpc5hc9u6GEzOtczvE mhbPNQ3ZFubdGfe/bV1Okg2zxWzk3fxE4KstsCPRIBzQtQwPtRP+W2A8FaQfWnX2gGDv yQfktyyE3JTkDJMzq+nCPiF0zdU31jrBYIj3rklHl3sIrb1ZlUEKl0a1nVHF/smztdF8 MAC2KRSAxoYbnY1ZDbDdg3WaqhdjivNJVYGHxtN2mdWcVwzRlKIawPIGIKf6OAEGHAb/ xr02CRdar5tqOR+Eok9LW0UzThyJWTIp0e9nGrvtGsDpMph8pa9RTuYX94npRYJ2gwPl 0/BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=FqYrY456; dkim=pass header.i=@linaro.org header.s=google header.b=dhl6FPTq; spf=pass (google.com: domain of libc-alpha-return-98232-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-98232-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id u186si12201733pgd.131.2018.12.11.11.56.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 11:56:45 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-98232-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=FqYrY456; dkim=pass header.i=@linaro.org header.s=google header.b=dhl6FPTq; spf=pass (google.com: domain of libc-alpha-return-98232-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-98232-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=gaMIp1Y3AEIhLqNVh+i6XdmENEHHs1i whf5ny91Bh5DgLvuJSiBxcgORfSO+47hct2rlTAUH5dRZpkB+q1ZDaQJT1TGrAsM vP/kPy6XU2HkG6YNu5lfdL/Vx5DW3JhBjZMsZdtlfwTVMagBXOn2Mh79QlKfC9+A XxNCMxC40lTM= 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=FqYrY 45692P5Ih9bmyU6c6yH8qIW7RTYfe5nAkiFhuN9llr861rGvIpQnWTNdasA1duOd lexMj4Cfs/kU78q33AaXdrOzmoqKqxvc9EoO99Rt/l/eNym6YawAPGEADnvw2ed1 oUgjOgNgfqC6sRHEyv7nZRthCfA9sZoyTZ+uNg= 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= Return-Path: 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(-) -- 2.17.1 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