fixes for 3.18

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-3.18/arm64-support-keyctl-system-call-in-32-bit-mode.patch b/queue-3.18/arm64-support-keyctl-system-call-in-32-bit-mode.patch
new file mode 100644 (file)
index 0000000..204111b
--- /dev/null
+++ b/queue-3.18/arm64-support-keyctl-system-call-in-32-bit-mode.patch
@@ -0,0 +1,37 @@
+From c0d7379e45cb2e5c256330a2efb5489945394105 Mon Sep 17 00:00:00 2001
+From: Eric Biggers <ebiggers@google.com>
+Date: Wed, 8 Mar 2017 16:27:04 -0800
+Subject: arm64: support keyctl() system call in 32-bit mode
+
+[ Upstream commit 5c2a625937ba49bc691089370638223d310cda9a ]
+
+As is the case for a number of other architectures that have a 32-bit
+compat mode, enable KEYS_COMPAT if both COMPAT and KEYS are enabled.
+This allows AArch32 programs to use the keyctl() system call when
+running on an AArch64 kernel.
+
+Signed-off-by: Eric Biggers <ebiggers@google.com>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/Kconfig | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
+index e8d81283c4fe..4ddf817f4a5c 100644
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -558,6 +558,10 @@ config SYSVIPC_COMPAT
+       def_bool y
+       depends on COMPAT && SYSVIPC
+ 
++config KEYS_COMPAT
++      def_bool y
++      depends on COMPAT && KEYS
++
+ endmenu
+ 
+ menu "Power management options"
+-- 
+2.19.1
+

diff --git a/queue-3.18/series b/queue-3.18/series
index e4609a9be23297ade38a6eed6c450eb682260cf7..6c092ac302372af4ef9a3b3e9b1bb7b8fb34c42a 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -47,3 +47,4 @@ gpio-adnp-fix-testing-wrong-value-in-adnp_gpio_direction_input.patch
 kvm-reject-device-ioctls-from-processes-other-than-the-vm-s-creator.patch
 xhci-fix-port-resume-done-detection-for-ss-ports-with-lpm-enabled.patch
 arm-imx6q-cpuidle-fix-bug-that-cpu-might-not-wake-up-at-expected-time.patch
+arm64-support-keyctl-system-call-in-32-bit-mode.patch