From: Jonas Gorski Date: Thu, 2 May 2013 15:28:12 +0000 (+0000) Subject: kernel: generic: don't strip /proc/irq on SMP X-Git-Tag: reboot~10523 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8f15326acca2d34200d3b1142bb4c184fa6c1e07;p=openwrt%2Fstaging%2Fblogic.git 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 SVN-Revision: 36525 --- 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 5133a107df48..f3fd7772778c 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 30512de95678..390a447d34a4 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 2489164189c3..ba58ce317705 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 48ad12cd931a..318db6370d3b 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 */