summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-02-14 10:22:26 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-02-14 10:22:38 -0500
commit7d0c6272a412dfbbd576dd11d5d05b06c5d4e0b8 (patch)
tree56bb7d3597e125da57dc9f84573574365120ec37
parent97821c04a8f0ffc3bf22570756a1e3e205c6f92c (diff)
downloadkernel-7d0c6272a412dfbbd576dd11d5d05b06c5d4e0b8.tar.gz
kernel-7d0c6272a412dfbbd576dd11d5d05b06c5d4e0b8.tar.xz
kernel-7d0c6272a412dfbbd576dd11d5d05b06c5d4e0b8.zip
Patch to enable CONFIG_KEYS_COMPAT on s390 from David Howells (rhbz 790367)
-rw-r--r--kernel.spec7
-rw-r--r--s390x-enable-keys-compat.patch15
2 files changed, 22 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 3641eb53..eaa7f889 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -761,6 +761,9 @@ Patch21236: autofs4-lockdep.patch
Patch21237: mcelog-rcu-splat.patch
Patch21238: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
+#rhbz 790367
+Patch21239: s390x-enable-keys-compat.patch
+
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1470,6 +1473,9 @@ ApplyPatch autofs4-lockdep.patch
ApplyPatch mcelog-rcu-splat.patch
ApplyPatch x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
+#rhbz 790367
+ApplyPatch s390x-enable-keys-compat.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2343,6 +2349,7 @@ fi
* Tue Feb 14 2012 Josh Boyer <jwboyer@redhat.com>
- Add patch to fix RCU usage during cpu idle (rhbz 789641)
- Add patch to fix mce rcu splat (rhbz 789644)
+- Patch to enable CONFIG_KEYS_COMPAT on s390 from David Howells (rhbz 790367)
* Tue Feb 14 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc3.git5.1
- Linux 3.3-rc3-git5 (upstream ce5afed937f0a823d3b00c9459409c3f5f2fbd5d)
diff --git a/s390x-enable-keys-compat.patch b/s390x-enable-keys-compat.patch
new file mode 100644
index 00000000..43d203ca
--- /dev/null
+++ b/s390x-enable-keys-compat.patch
@@ -0,0 +1,15 @@
+@@ -, +, @@
+ arch/s390/Kconfig | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+--- a/arch/s390/Kconfig
++++ a/arch/s390/Kconfig
+@@ -227,6 +227,9 @@ config COMPAT
+ config SYSVIPC_COMPAT
+ def_bool y if COMPAT && SYSVIPC
+
++config KEYS_COMPAT
++ def_bool y if COMPAT && KEYS
++
+ config AUDIT_ARCH
+ def_bool y
+