Commit edc2cbf4 authored by Stefan Richter's avatar Stefan Richter Committed by Linus Torvalds

i386: remove old IRQ balancing debug cruft

Dead or misnamed CONFIG_BALANCED_IRQ_DEBUG found by Robert P. J. Day.
It's not a Kconfig variable.

Since this debug code is ancient, I suggest to get rid of this
misleading CONFIG_ macro by deleting all of this debug code.
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Robert P. J. Day" <rpjday@mindspring.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1dfd851
...@@ -353,14 +353,6 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) ...@@ -353,14 +353,6 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
# include <linux/slab.h> /* kmalloc() */ # include <linux/slab.h> /* kmalloc() */
# include <linux/timer.h> /* time_after() */ # include <linux/timer.h> /* time_after() */
#ifdef CONFIG_BALANCED_IRQ_DEBUG
# define TDprintk(x...) do { printk("<%ld:%s:%d>: ", jiffies, __FILE__, __LINE__); printk(x); } while (0)
# define Dprintk(x...) do { TDprintk(x); } while (0)
# else
# define TDprintk(x...)
# define Dprintk(x...)
# endif
#define IRQBALANCE_CHECK_ARCH -999 #define IRQBALANCE_CHECK_ARCH -999
#define MAX_BALANCED_IRQ_INTERVAL (5*HZ) #define MAX_BALANCED_IRQ_INTERVAL (5*HZ)
#define MIN_BALANCED_IRQ_INTERVAL (HZ/2) #define MIN_BALANCED_IRQ_INTERVAL (HZ/2)
...@@ -443,7 +435,7 @@ static inline void balance_irq(int cpu, int irq) ...@@ -443,7 +435,7 @@ static inline void balance_irq(int cpu, int irq)
static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold)
{ {
int i, j; int i, j;
Dprintk("Rotating IRQs among CPUs.\n");
for_each_online_cpu(i) { for_each_online_cpu(i) {
for (j = 0; j < NR_IRQS; j++) { for (j = 0; j < NR_IRQS; j++) {
if (!irq_desc[j].action) if (!irq_desc[j].action)
...@@ -560,19 +552,11 @@ static void do_irq_balance(void) ...@@ -560,19 +552,11 @@ static void do_irq_balance(void)
max_loaded = tmp_loaded; /* processor */ max_loaded = tmp_loaded; /* processor */
imbalance = (max_cpu_irq - min_cpu_irq) / 2; imbalance = (max_cpu_irq - min_cpu_irq) / 2;
Dprintk("max_loaded cpu = %d\n", max_loaded);
Dprintk("min_loaded cpu = %d\n", min_loaded);
Dprintk("max_cpu_irq load = %ld\n", max_cpu_irq);
Dprintk("min_cpu_irq load = %ld\n", min_cpu_irq);
Dprintk("load imbalance = %lu\n", imbalance);
/* if imbalance is less than approx 10% of max load, then /* if imbalance is less than approx 10% of max load, then
* observe diminishing returns action. - quit * observe diminishing returns action. - quit
*/ */
if (imbalance < (max_cpu_irq >> 3)) { if (imbalance < (max_cpu_irq >> 3))
Dprintk("Imbalance too trivial\n");
goto not_worth_the_effort; goto not_worth_the_effort;
}
tryanotherirq: tryanotherirq:
/* if we select an IRQ to move that can't go where we want, then /* if we select an IRQ to move that can't go where we want, then
...@@ -629,9 +613,6 @@ static void do_irq_balance(void) ...@@ -629,9 +613,6 @@ static void do_irq_balance(void)
cpus_and(tmp, target_cpu_mask, allowed_mask); cpus_and(tmp, target_cpu_mask, allowed_mask);
if (!cpus_empty(tmp)) { if (!cpus_empty(tmp)) {
Dprintk("irq = %d moved to cpu = %d\n",
selected_irq, min_loaded);
/* mark for change destination */ /* mark for change destination */
set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded));
...@@ -651,7 +632,6 @@ static void do_irq_balance(void) ...@@ -651,7 +632,6 @@ static void do_irq_balance(void)
*/ */
balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL,
balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); balanced_irq_interval + BALANCED_IRQ_MORE_DELTA);
Dprintk("IRQ worth rotating not found\n");
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment