The patch titled
Subject: signals, pkeys: make si_pkey 32 bits for now
has been removed from the -mm tree. Its filename was
add-compile-time-check-for-__arch_si_preamble_size-fix.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: signals, pkeys: make si_pkey 32 bits for now
to prevent a change of alignment in the siginfo structure
Fixes: cd0ea35ff551 ("signals, pkeys: Notify userspace about protection key faults")
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Acked-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Helge Deller <deller@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/ia64/include/uapi/asm/siginfo.h | 2 +-
arch/mips/include/uapi/asm/siginfo.h | 2 +-
include/uapi/asm-generic/siginfo.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/ia64/include/uapi/asm/siginfo.h~add-compile-time-check-for-__arch_si_preamble_size-fix arch/ia64/include/uapi/asm/siginfo.h
--- a/arch/ia64/include/uapi/asm/siginfo.h~add-compile-time-check-for-__arch_si_preamble_size-fix
+++ a/arch/ia64/include/uapi/asm/siginfo.h
@@ -70,7 +70,7 @@ typedef struct siginfo {
void __user *_upper;
} _addr_bnd;
/* used when si_code=SEGV_PKUERR */
- u64 _pkey;
+ int _pkey;
};
} _sigfault;
diff -puN arch/mips/include/uapi/asm/siginfo.h~add-compile-time-check-for-__arch_si_preamble_size-fix arch/mips/include/uapi/asm/siginfo.h
--- a/arch/mips/include/uapi/asm/siginfo.h~add-compile-time-check-for-__arch_si_preamble_size-fix
+++ a/arch/mips/include/uapi/asm/siginfo.h
@@ -93,7 +93,7 @@ typedef struct siginfo {
void __user *_upper;
} _addr_bnd;
/* used when si_code=SEGV_PKUERR */
- u64 _pkey;
+ int _pkey;
};
} _sigfault;
diff -puN include/uapi/asm-generic/siginfo.h~add-compile-time-check-for-__arch_si_preamble_size-fix include/uapi/asm-generic/siginfo.h
--- a/include/uapi/asm-generic/siginfo.h~add-compile-time-check-for-__arch_si_preamble_size-fix
+++ a/include/uapi/asm-generic/siginfo.h
@@ -98,7 +98,7 @@ typedef struct siginfo {
void __user *_upper;
} _addr_bnd;
/* used when si_code=SEGV_PKUERR */
- u64 _pkey;
+ int _pkey;
};
} _sigfault;
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
mm-cleanup-pte_alloc-interfaces-fix-2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
