From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947996AbcBRUUv (ORCPT ); Thu, 18 Feb 2016 15:20:51 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46924 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947090AbcBRUUs (ORCPT ); Thu, 18 Feb 2016 15:20:48 -0500 Date: Thu, 18 Feb 2016 12:20:05 -0800 From: tip-bot for Dave Hansen Message-ID: Cc: dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, dave@sr71.net, peterz@infradead.org, fenghua.yu@intel.com, mingo@kernel.org, ralf@linux-mips.org, torvalds@linux-foundation.org, oss@malat.biz, tony.luck@intel.com Reply-To: torvalds@linux-foundation.org, mingo@kernel.org, ralf@linux-mips.org, tony.luck@intel.com, oss@malat.biz, peterz@infradead.org, fenghua.yu@intel.com, dave@sr71.net, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com In-Reply-To: <20160217181703.E99B6656@viggo.jf.intel.com> References: <20160217181703.E99B6656@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:mm/pkeys] signals, ia64, mips: Update arch-specific siginfos with pkeys field Git-Commit-ID: b376cd0256f86db3078409dc51963b315c7843d8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b376cd0256f86db3078409dc51963b315c7843d8 Gitweb: http://git.kernel.org/tip/b376cd0256f86db3078409dc51963b315c7843d8 Author: Dave Hansen AuthorDate: Wed, 17 Feb 2016 10:17:03 -0800 Committer: Ingo Molnar CommitDate: Thu, 18 Feb 2016 09:32:42 +0100 signals, ia64, mips: Update arch-specific siginfos with pkeys field ia64 and mips have separate definitions for siginfo from the generic one. Patch them to have the pkey fields. Note that this is exactly what we did for MPX as well. [ This fixes a compile error that Ingo was hitting with MIPS when the x86 pkeys patch set is applied. ] Signed-off-by: Dave Hansen Cc: Dave Hansen Cc: Fenghua Yu Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Petr Malat Cc: Ralf Baechle Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-ia64@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20160217181703.E99B6656@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/ia64/include/uapi/asm/siginfo.h | 13 +++++++++---- arch/mips/include/uapi/asm/siginfo.h | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h index bce9bc1..0151cfa 100644 --- a/arch/ia64/include/uapi/asm/siginfo.h +++ b/arch/ia64/include/uapi/asm/siginfo.h @@ -63,10 +63,15 @@ typedef struct siginfo { unsigned int _flags; /* see below */ unsigned long _isr; /* isr */ short _addr_lsb; /* lsb of faulting address */ - struct { - void __user *_lower; - void __user *_upper; - } _addr_bnd; + union { + /* used when si_code=SEGV_BNDERR */ + struct { + void __user *_lower; + void __user *_upper; + } _addr_bnd; + /* used when si_code=SEGV_PKUERR */ + u64 _pkey; + }; } _sigfault; /* SIGPOLL */ diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h index 2cb7fde..6f4edf0 100644 --- a/arch/mips/include/uapi/asm/siginfo.h +++ b/arch/mips/include/uapi/asm/siginfo.h @@ -86,10 +86,15 @@ typedef struct siginfo { int _trapno; /* TRAP # which caused the signal */ #endif short _addr_lsb; - struct { - void __user *_lower; - void __user *_upper; - } _addr_bnd; + union { + /* used when si_code=SEGV_BNDERR */ + struct { + void __user *_lower; + void __user *_upper; + } _addr_bnd; + /* used when si_code=SEGV_PKUERR */ + u64 _pkey; + }; } _sigfault; /* SIGPOLL, SIGXFSZ (To do ...) */