summaryrefslogtreecommitdiffstats
path: root/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2015-10-07 16:39:21 -0500
committerJustin M. Forbes <jforbes@redhat.com>2015-10-07 16:39:21 -0500
commitf6be2115274f69a5aa948cc23e14cf6092b0b89c (patch)
tree5d3b2ba7ad47e52fc7643e9e5538e3139809fa1b /kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
parent135b2dddfb21e74ff0dcade06b65b663f4dacc91 (diff)
downloadkernel-f6be2115274f69a5aa948cc23e14cf6092b0b89c.tar.gz
kernel-f6be2115274f69a5aa948cc23e14cf6092b0b89c.tar.xz
kernel-f6be2115274f69a5aa948cc23e14cf6092b0b89c.zip
Linux v4.2.3
Diffstat (limited to 'kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch')
-rw-r--r--kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
index 5e2d79ec3..cc821411d 100644
--- a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+++ b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
@@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
1 file changed, 8 insertions(+)
diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 38c25b1f2fd5..f2b5272156ce 100644
+index a785c1015e25..81d6b404f33c 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -36,6 +36,7 @@
@@ -24,7 +24,7 @@ index 38c25b1f2fd5..f2b5272156ce 100644
#include <asm/page.h>
#include <asm/uaccess.h>
-@@ -1247,6 +1248,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
+@@ -1258,6 +1259,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
return -EPERM;
/*