Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask

Conflicts: arch/x86/kernel/io_apic.c kernel/rcuclassic.c kernel/sched.c kernel/time/tick-sched.c Signed-off-by: Mike Travis <travis@sgi.com> [ mingo@elte.hu: backmerged typo fix for io_apic.c ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-09-26 18:16:26 +00:00 · 2008-12-31 17:34:16 -08:00 · 2008-12-31 17:34:16 -08:00 · 7eb1955336
commit 7eb1955336
parent 6092848a2a 8c384cdee3
5078 changed files with 405279 additions and 254952 deletions
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
--- a/kernel/Makefile
+++ b/kernel/Makefile
--- a/kernel/acct.c
+++ b/kernel/acct.c
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
--- a/kernel/capability.c
+++ b/kernel/capability.c
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
--- a/kernel/compat.c
+++ b/kernel/compat.c
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
--- a/kernel/cred-internals.h
+++ b/kernel/cred-internals.h
--- a/kernel/cred.c
+++ b/kernel/cred.c
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/futex.c
+++ b/kernel/futex.c
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
--- a/kernel/irq/numa_migrate.c
+++ b/kernel/irq/numa_migrate.c
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
--- a/kernel/panic.c
+++ b/kernel/panic.c
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
--- a/kernel/power/poweroff.c
+++ b/kernel/power/poweroff.c
--- a/kernel/printk.c
+++ b/kernel/printk.c
--- a/kernel/profile.c
+++ b/kernel/profile.c
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
--- a/kernel/rcuclassic.c
+++ b/kernel/rcuclassic.c
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
--- a/kernel/rcupreempt_trace.c
+++ b/kernel/rcupreempt_trace.c
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
--- a/kernel/rcutree_trace.c
+++ b/kernel/rcutree_trace.c
--- a/kernel/resource.c
+++ b/kernel/resource.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
--- a/kernel/signal.c
+++ b/kernel/signal.c
--- a/kernel/smp.c
+++ b/kernel/smp.c
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
--- a/kernel/stacktrace.c
+++ b/kernel/stacktrace.c
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
--- a/kernel/sys.c
+++ b/kernel/sys.c
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
--- a/kernel/timer.c
+++ b/kernel/timer.c
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
--- a/kernel/trace/trace_bts.c
+++ b/kernel/trace/trace_bts.c
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
--- a/kernel/trace/trace_mmiotrace.c
+++ b/kernel/trace/trace_mmiotrace.c
--- a/kernel/trace/trace_power.c
+++ b/kernel/trace/trace_power.c
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
--- a/kernel/trace/trace_sysprof.c
+++ b/kernel/trace/trace_sysprof.c
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
--- a/kernel/uid16.c
+++ b/kernel/uid16.c
--- a/kernel/user.c
+++ b/kernel/user.c
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c