summaryrefslogtreecommitdiffstats
path: root/Add-secure_modules-call.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 /Add-secure_modules-call.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 'Add-secure_modules-call.patch')
-rw-r--r--Add-secure_modules-call.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch
index d68a7e103..f517ccf02 100644
--- a/Add-secure_modules-call.patch
+++ b/Add-secure_modules-call.patch
@@ -16,10 +16,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
2 files changed, 17 insertions(+)
diff --git a/include/linux/module.h b/include/linux/module.h
-index 71f282a4e307..341a73ecea2e 100644
+index ebfb0e153c6a..089de6be8062 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
-@@ -516,6 +516,8 @@ int unregister_module_notifier(struct notifier_block *nb);
+@@ -502,6 +502,8 @@ int unregister_module_notifier(struct notifier_block *nb);
extern void print_modules(void);
@@ -28,7 +28,7 @@ index 71f282a4e307..341a73ecea2e 100644
#else /* !CONFIG_MODULES... */
/* Given an address, look for it in the exception tables. */
-@@ -626,6 +628,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
+@@ -612,6 +614,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
static inline void print_modules(void)
{
}
@@ -41,10 +41,10 @@ index 71f282a4e307..341a73ecea2e 100644
#ifdef CONFIG_SYSFS
diff --git a/kernel/module.c b/kernel/module.c
-index 88cec1ddb1e3..6507ffcb5445 100644
+index 3965511ae133..fd8c5495fdc6 100644
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -3844,3 +3844,13 @@ void module_layout(struct module *mod,
+@@ -3850,3 +3850,13 @@ void module_layout(struct module *mod,
}
EXPORT_SYMBOL(module_layout);
#endif