From: Jan-Benedict G. <jb...@he...> - 2007-08-12 22:33:16
|
arch/i386/kernel/io_apic.c | 7 ++++-- arch/x86_64/kernel/io_apic.c | 7 ++++-- include/linux/cpu.h | 2 - kernel/irq/chip.c | 5 ---- kernel/irq/resend.c | 7 +++++- kernel/sched.c | 48 +++++++++++++++++++++---------------------- kernel/sched_fair.c | 12 +++++----- 7 files changed, 47 insertions(+), 41 deletions(-) New commits: commit ea2a435bf9d2feffe7f6bd098f9caa94c8f3ec13 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ea2a435bf9d2feffe7f6bd098f9caa94c8f3ec13 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ea2a435bf9d2feffe7f6bd098f9caa94c8f3ec13 Merge: 797e8e92d4d3462479be6a98ab5301db45114a1e 738ddd30397c25adfa9729257623ada96ef8ce96 Author: Jan-Benedict Glaw <jb...@jb...> Date: Mon Aug 13 00:32:25 2007 +0200 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into vax4linus commit 738ddd30397c25adfa9729257623ada96ef8ce96 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=738ddd30397c25adfa9729257623ada96ef8ce96 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=738ddd30397c25adfa9729257623ada96ef8ce96 Merge: cc75b92d11384ba14f93828a2a0040344ae872e7 de0cf899bbf06b6f64a5dce9c59d74c41b6b4232 Author: Linus Torvalds <tor...@wo...> Date: Sun Aug 12 11:06:45 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: run_rebalance_domains: s/SCHED_IDLE/CPU_IDLE/ sched: fix sleeper bonus sched: make global code static commit cc75b92d11384ba14f93828a2a0040344ae872e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cc75b92d11384ba14f93828a2a0040344ae872e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cc75b92d11384ba14f93828a2a0040344ae872e7 Author: Thomas Gleixner <tg...@li...> Date: Sun Aug 12 15:46:36 2007 +0000 genirq: mark io_apic level interrupts to avoid resend Level type interrupts do not need to be resent. It was also found that some chipsets get confused in case of the resend. Mark the ioapic level type interrupts as such to avoid the resend functionality in the generic irq code. Signed-off-by: Thomas Gleixner <tg...@li...> Signed-off-by: Linus Torvalds <tor...@li...> commit 2464286ace55b3abddfb9cc30ab95e2dac1de9a6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2464286ace55b3abddfb9cc30ab95e2dac1de9a6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2464286ace55b3abddfb9cc30ab95e2dac1de9a6 Author: Thomas Gleixner <tg...@li...> Date: Sun Aug 12 15:46:35 2007 +0000 genirq: suppress resend of level interrupts Level type interrupts are resent by the interrupt hardware when they are still active at irq_enable(). Suppress the resend mechanism for interrupts marked as level. Signed-off-by: Thomas Gleixner <tg...@li...> Signed-off-by: Linus Torvalds <tor...@li...> commit 496634217e5671ed876a0348e9f5b7165e830b20 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=496634217e5671ed876a0348e9f5b7165e830b20 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=496634217e5671ed876a0348e9f5b7165e830b20 Author: Thomas Gleixner <tg...@li...> Date: Sun Aug 12 15:46:34 2007 +0000 genirq: cleanup mismerge artifact Commit 5a43a066b11ac2fe84cf67307f20b83bea390f83: "genirq: Allow fasteoi handler to retrigger disabled interrupts" was erroneously applied to handle_level_irq(). This added the irq retrigger / resend functionality to the level irq handler. Revert the offending bits. Signed-off-by: Thomas Gleixner <tg...@li...> Signed-off-by: Linus Torvalds <tor...@li...> commit de0cf899bbf06b6f64a5dce9c59d74c41b6b4232 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=de0cf899bbf06b6f64a5dce9c59d74c41b6b4232 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=de0cf899bbf06b6f64a5dce9c59d74c41b6b4232 Author: Oleg Nesterov <ol...@tv...> Date: Sun Aug 12 18:08:19 2007 +0200 sched: run_rebalance_domains: s/SCHED_IDLE/CPU_IDLE/ rebalance_domains(SCHED_IDLE) looks strange (typo), change it to CPU_IDLE. the effect of this bug was slightly more agressive idle-balancing on SMP than intended. Signed-off-by: Oleg Nesterov <ol...@tv...> Signed-off-by: Ingo Molnar <mi...@el...> commit 5d2b3d3695a841231b65b5536a70dc29961c5611 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5d2b3d3695a841231b65b5536a70dc29961c5611 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5d2b3d3695a841231b65b5536a70dc29961c5611 Author: Ingo Molnar <mi...@el...> Date: Sun Aug 12 18:08:19 2007 +0200 sched: fix sleeper bonus Peter Ziljstra noticed that the sleeper bonus deduction code was not properly rate-limited: a task that scheduled more frequently would get a disproportionately large deduction. So limit the deduction to delta_exec. Signed-off-by: Ingo Molnar <mi...@el...> commit 6707de00fdec3e3225192fe3dcd21323a8936b1f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6707de00fdec3e3225192fe3dcd21323a8936b1f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6707de00fdec3e3225192fe3dcd21323a8936b1f Author: Adrian Bunk <bu...@st...> Date: Sun Aug 12 18:08:19 2007 +0200 sched: make global code static This patch makes the following needlessly global code static: - arch_reinit_sched_domains() - struct attr_sched_mc_power_savings - struct attr_sched_smt_power_savings Signed-off-by: Adrian Bunk <bu...@st...> Signed-off-by: Andrew Morton <ak...@li...> Signed-off-by: Ingo Molnar <mi...@el...> |