summaryrefslogtreecommitdiffstats
path: root/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-11-11 11:24:30 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-11-11 11:25:55 -0500
commitf70c487fdb567cdd650d03d0f3eaa82d2480a267 (patch)
tree26fc932ce298ffd79d9579288689e2b1ab9bb730 /kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
parente208283f33477c6ad3719ea0c13a400828a25fbe (diff)
downloadkernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.tar.gz
kernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.tar.xz
kernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.zip
Linux v4.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.patch22
1 files changed, 13 insertions, 9 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..a5832ea70 100644
--- a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+++ b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
@@ -1,3 +1,4 @@
+From 6306cad6e5663424c08e5ebdfdcfd799c5537bfe Mon Sep 17 00:00:00 2001
From: Matthew Garrett <matthew.garrett@nebula.com>
Date: Fri, 9 Aug 2013 03:33:56 -0400
Subject: [PATCH] kexec: Disable at runtime if the kernel enforces module
@@ -13,18 +14,18 @@ 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 4c5edc357923..db431971dbd4 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
-@@ -36,6 +36,7 @@
- #include <linux/syscore_ops.h>
- #include <linux/compiler.h>
- #include <linux/hugetlb.h>
+@@ -10,6 +10,7 @@
+ #include <linux/mm.h>
+ #include <linux/file.h>
+ #include <linux/kexec.h>
+#include <linux/module.h>
-
- #include <asm/page.h>
- #include <asm/uaccess.h>
-@@ -1247,6 +1248,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
+ #include <linux/mutex.h>
+ #include <linux/list.h>
+ #include <linux/syscalls.h>
+@@ -133,6 +134,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
return -EPERM;
/*
@@ -38,3 +39,6 @@ index 38c25b1f2fd5..f2b5272156ce 100644
* Verify we have a legal set of flags
* This leaves us room for future extensions.
*/
+--
+2.4.3
+