diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-06 16:34:35 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-06 16:34:35 -0400 |
| commit | 088a50c52e6f720fdbd321871fb3e30e241508c5 (patch) | |
| tree | 1a71348d2e970f1d6f8a1f824935e54d64d00040 /Add-secure_modules-call.patch | |
| parent | 55b5c15b8f0c65f111c9fb61b839024d0502798c (diff) | |
| download | kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.gz kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.xz kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.zip | |
Linux v4.2-rc1
- Disable debug options.
- Add patch to fix perf build
Diffstat (limited to 'Add-secure_modules-call.patch')
| -rw-r--r-- | Add-secure_modules-call.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch index 1d7ddcb98..6a01b9f17 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, 16 insertions(+) diff --git a/include/linux/module.h b/include/linux/module.h -index 7ffe0851d244..3da68fd1f657 100644 +index d67b1932cc59..57474384b66b 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -515,6 +515,8 @@ static inline bool module_requested_async_probing(struct module *module) +@@ -551,6 +551,8 @@ static inline bool module_requested_async_probing(struct module *module) return module && module->async_probe_requested; } @@ -28,7 +28,7 @@ index 7ffe0851d244..3da68fd1f657 100644 #else /* !CONFIG_MODULES... */ /* Given an address, look for it in the exception tables. */ -@@ -631,6 +633,10 @@ static inline bool module_requested_async_probing(struct module *module) +@@ -667,6 +669,10 @@ static inline bool module_requested_async_probing(struct module *module) return false; } @@ -40,10 +40,10 @@ index 7ffe0851d244..3da68fd1f657 100644 #ifdef CONFIG_SYSFS diff --git a/kernel/module.c b/kernel/module.c -index f80a97f7da1f..5d3e6c6191fa 100644 +index 3e0e19763d24..c3bce9c6a746 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3925,3 +3925,13 @@ void module_layout(struct module *mod, +@@ -4082,3 +4082,13 @@ void module_layout(struct module *mod, } EXPORT_SYMBOL(module_layout); #endif |