From 98bc05922b9cade4b86f2882a781ea3885f559f8 Mon Sep 17 00:00:00 2001 From: jogo Date: Thu, 2 May 2013 15:28:12 +0000 Subject: kernel: generic: don't strip /proc/irq on SMP /proc/irq is needed for changing the SMP affinity of interrupts. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36525 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.6/902-debloat_proc.patch | 6 +++--- target/linux/generic/patches-3.7/902-debloat_proc.patch | 6 +++--- target/linux/generic/patches-3.8/902-debloat_proc.patch | 6 +++--- target/linux/generic/patches-3.9/902-debloat_proc.patch | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/target/linux/generic/patches-3.6/902-debloat_proc.patch b/target/linux/generic/patches-3.6/902-debloat_proc.patch index 5133a107d..f3fd77727 100644 --- a/target/linux/generic/patches-3.6/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.6/902-debloat_proc.patch @@ -83,7 +83,7 @@ { char name [MAX_NAMELEN]; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir) @@ -93,7 +93,7 @@ { char name [MAX_NAMELEN]; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + if (!root_irq_dir || !desc->dir) @@ -103,7 +103,7 @@ unsigned int irq; struct irq_desc *desc; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + /* create /proc/irq */ diff --git a/target/linux/generic/patches-3.7/902-debloat_proc.patch b/target/linux/generic/patches-3.7/902-debloat_proc.patch index 30512de95..390a447d3 100644 --- a/target/linux/generic/patches-3.7/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.7/902-debloat_proc.patch @@ -83,7 +83,7 @@ { char name [MAX_NAMELEN]; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir) @@ -93,7 +93,7 @@ { char name [MAX_NAMELEN]; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + if (!root_irq_dir || !desc->dir) @@ -103,7 +103,7 @@ unsigned int irq; struct irq_desc *desc; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + /* create /proc/irq */ diff --git a/target/linux/generic/patches-3.8/902-debloat_proc.patch b/target/linux/generic/patches-3.8/902-debloat_proc.patch index 248916418..ba58ce317 100644 --- a/target/linux/generic/patches-3.8/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.8/902-debloat_proc.patch @@ -83,7 +83,7 @@ { char name [MAX_NAMELEN]; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir) @@ -93,7 +93,7 @@ { char name [MAX_NAMELEN]; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + if (!root_irq_dir || !desc->dir) @@ -103,7 +103,7 @@ unsigned int irq; struct irq_desc *desc; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + /* create /proc/irq */ diff --git a/target/linux/generic/patches-3.9/902-debloat_proc.patch b/target/linux/generic/patches-3.9/902-debloat_proc.patch index 48ad12cd9..318db6370 100644 --- a/target/linux/generic/patches-3.9/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.9/902-debloat_proc.patch @@ -83,7 +83,7 @@ { char name [MAX_NAMELEN]; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir) @@ -93,7 +93,7 @@ { char name [MAX_NAMELEN]; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + if (!root_irq_dir || !desc->dir) @@ -103,7 +103,7 @@ unsigned int irq; struct irq_desc *desc; -+ if (IS_ENABLED(CONFIG_PROC_STRIPPED)) ++ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP)) + return; + /* create /proc/irq */ -- cgit v1.2.3