diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-07-21 11:11:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:14 -0400 |
commit | edc2cbf49682079d5344bf7f2545ed6b036fa355 (patch) | |
tree | 33ea4da1e82e8b854c07d5997436ffd6cf4b52f0 /arch/i386 | |
parent | a1dfd851b97bfefeb50e6ccf8cd2c52f9acd8fea (diff) |
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: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Robert P. J. Day" <rpjday@mindspring.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/io_apic.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 1bc4f7e4ed2..893df828075 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
@@ -353,14 +353,6 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) | |||
353 | # include <linux/slab.h> /* kmalloc() */ | 353 | # include <linux/slab.h> /* kmalloc() */ |
354 | # include <linux/timer.h> /* time_after() */ | 354 | # include <linux/timer.h> /* time_after() */ |
355 | 355 | ||
356 | #ifdef CONFIG_BALANCED_IRQ_DEBUG | ||
357 | # define TDprintk(x...) do { printk("<%ld:%s:%d>: ", jiffies, __FILE__, __LINE__); printk(x); } while (0) | ||
358 | # define Dprintk(x...) do { TDprintk(x); } while (0) | ||
359 | # else | ||
360 | # define TDprintk(x...) | ||
361 | # define Dprintk(x...) | ||
362 | # endif | ||
363 | |||
364 | #define IRQBALANCE_CHECK_ARCH -999 | 356 | #define IRQBALANCE_CHECK_ARCH -999 |
365 | #define MAX_BALANCED_IRQ_INTERVAL (5*HZ) | 357 | #define MAX_BALANCED_IRQ_INTERVAL (5*HZ) |
366 | #define MIN_BALANCED_IRQ_INTERVAL (HZ/2) | 358 | #define MIN_BALANCED_IRQ_INTERVAL (HZ/2) |
@@ -443,7 +435,7 @@ static inline void balance_irq(int cpu, int irq) | |||
443 | static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) | 435 | static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) |
444 | { | 436 | { |
445 | int i, j; | 437 | int i, j; |
446 | Dprintk("Rotating IRQs among CPUs.\n"); | 438 | |
447 | for_each_online_cpu(i) { | 439 | for_each_online_cpu(i) { |
448 | for (j = 0; j < NR_IRQS; j++) { | 440 | for (j = 0; j < NR_IRQS; j++) { |
449 | if (!irq_desc[j].action) | 441 | if (!irq_desc[j].action) |
@@ -560,19 +552,11 @@ tryanothercpu: | |||
560 | max_loaded = tmp_loaded; /* processor */ | 552 | max_loaded = tmp_loaded; /* processor */ |
561 | imbalance = (max_cpu_irq - min_cpu_irq) / 2; | 553 | imbalance = (max_cpu_irq - min_cpu_irq) / 2; |
562 | 554 | ||
563 | Dprintk("max_loaded cpu = %d\n", max_loaded); | ||
564 | Dprintk("min_loaded cpu = %d\n", min_loaded); | ||
565 | Dprintk("max_cpu_irq load = %ld\n", max_cpu_irq); | ||
566 | Dprintk("min_cpu_irq load = %ld\n", min_cpu_irq); | ||
567 | Dprintk("load imbalance = %lu\n", imbalance); | ||
568 | |||
569 | /* if imbalance is less than approx 10% of max load, then | 555 | /* if imbalance is less than approx 10% of max load, then |
570 | * observe diminishing returns action. - quit | 556 | * observe diminishing returns action. - quit |
571 | */ | 557 | */ |
572 | if (imbalance < (max_cpu_irq >> 3)) { | 558 | if (imbalance < (max_cpu_irq >> 3)) |
573 | Dprintk("Imbalance too trivial\n"); | ||
574 | goto not_worth_the_effort; | 559 | goto not_worth_the_effort; |
575 | } | ||
576 | 560 | ||
577 | tryanotherirq: | 561 | tryanotherirq: |
578 | /* if we select an IRQ to move that can't go where we want, then | 562 | /* if we select an IRQ to move that can't go where we want, then |
@@ -629,9 +613,6 @@ tryanotherirq: | |||
629 | cpus_and(tmp, target_cpu_mask, allowed_mask); | 613 | cpus_and(tmp, target_cpu_mask, allowed_mask); |
630 | 614 | ||
631 | if (!cpus_empty(tmp)) { | 615 | if (!cpus_empty(tmp)) { |
632 | |||
633 | Dprintk("irq = %d moved to cpu = %d\n", | ||
634 | selected_irq, min_loaded); | ||
635 | /* mark for change destination */ | 616 | /* mark for change destination */ |
636 | set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); | 617 | set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); |
637 | 618 | ||
@@ -651,7 +632,6 @@ not_worth_the_effort: | |||
651 | */ | 632 | */ |
652 | balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, | 633 | balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, |
653 | balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); | 634 | balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); |
654 | Dprintk("IRQ worth rotating not found\n"); | ||
655 | return; | 635 | return; |
656 | } | 636 | } |
657 | 637 | ||