summaryrefslogtreecommitdiffstats
path: root/hibernate-Disable-in-a-signed-modules-environment.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-01-05 16:09:49 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-05 16:09:49 -0500
commit208228cebd8a9b5af5da4e12e3d90e4a03679cf0 (patch)
tree0cf4e87e7877bff42d1f3b480c2d585347ee3eba /hibernate-Disable-in-a-signed-modules-environment.patch
parentbfe354a1c3609cdd83fd0647153365ff4f81701f (diff)
downloadkernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.gz
kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.xz
kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.zip
Linux v3.19-rc2
- Temporarily disable aarch64patches - Happy New Year
Diffstat (limited to 'hibernate-Disable-in-a-signed-modules-environment.patch')
-rw-r--r--hibernate-Disable-in-a-signed-modules-environment.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/hibernate-Disable-in-a-signed-modules-environment.patch b/hibernate-Disable-in-a-signed-modules-environment.patch
index fa1d53a51..f1cc67935 100644
--- a/hibernate-Disable-in-a-signed-modules-environment.patch
+++ b/hibernate-Disable-in-a-signed-modules-environment.patch
@@ -13,18 +13,18 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index 1f35a3478f3c..5e2472fc3dda 100644
+index 2329daae5255..48a8e82c7e2e 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
-@@ -28,6 +28,7 @@
- #include <linux/syscore_ops.h>
+@@ -29,6 +29,7 @@
#include <linux/ctype.h>
#include <linux/genhd.h>
+ #include <linux/ktime.h>
+#include <linux/module.h>
#include <trace/events/power.h>
#include "power.h"
-@@ -65,7 +66,7 @@ static const struct platform_hibernation_ops *hibernation_ops;
+@@ -66,7 +67,7 @@ static const struct platform_hibernation_ops *hibernation_ops;
bool hibernation_available(void)
{