aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/902-debloat_proc.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
commit2f99e562e03487b927782fcd0f690346d71c34e1 (patch)
tree0e0299593a79411fc54596a60bcc0b05db458703 /target/linux/generic/patches-3.18/902-debloat_proc.patch
parent0625aaa6f37dcf6a2ffb611245fa9b6477642b78 (diff)
downloadupstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.gz
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.bz2
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.zip
CC: kernel: update kernel 3.18 to version 3.18.23
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23 backport of r47334. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/902-debloat_proc.patch')
-rw-r--r--target/linux/generic/patches-3.18/902-debloat_proc.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/902-debloat_proc.patch b/target/linux/generic/patches-3.18/902-debloat_proc.patch
index 52beed2128..5cecd1e677 100644
--- a/target/linux/generic/patches-3.18/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.18/902-debloat_proc.patch
@@ -79,17 +79,17 @@
}
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
-@@ -328,6 +328,9 @@ void register_irq_proc(unsigned int irq,
- {
+@@ -330,6 +330,9 @@ void register_irq_proc(unsigned int irq,
+ static DEFINE_MUTEX(register_lock);
char name [MAX_NAMELEN];
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
+ return;
+
- if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir)
+ if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip))
return;
-@@ -364,6 +367,9 @@ void unregister_irq_proc(unsigned int ir
+@@ -379,6 +382,9 @@ void unregister_irq_proc(unsigned int ir
{
char name [MAX_NAMELEN];
@@ -99,7 +99,7 @@
if (!root_irq_dir || !desc->dir)
return;
#ifdef CONFIG_SMP
-@@ -399,6 +405,9 @@ void init_irq_proc(void)
+@@ -414,6 +420,9 @@ void init_irq_proc(void)
unsigned int irq;
struct irq_desc *desc;