summaryrefslogtreecommitdiff
path: root/kernel/sched.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tracing/hw-branch-tracing' into tracing/coreIngo Molnar2009-05-071-0/+43
|\
| * Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracingIngo Molnar2009-04-241-15/+149
| |\
| * | sched, hw-branch-tracer: add wait_task_context_switch() function to sched.hMarkus Metzger2009-04-071-0/+43
* | | Merge branch 'linus' into tracing/coreIngo Molnar2009-05-071-4/+8
|\ \ \
| * | | sched: account system time properlyEric Dumazet2009-04-291-1/+1
| | |/ | |/|
| * | sched: Avoid printing sched_group::__cpu_power for default caseGautham R Shenoy2009-04-171-2/+6
| * | tracing, sched: mark get_parent_ip() notraceLai Jiangshan2009-04-141-1/+1
* | | tracepoint: trace_sched_migrate_task(): remove parameterMathieu Desnoyers2009-05-061-1/+1
* | | tracing/events: move trace point headers into include/trace/eventsSteven Rostedt2009-04-141-1/+1
* | | tracing: create automated trace definesSteven Rostedt2009-04-141-7/+3
|/ /
* | Merge commit 'v2.6.30-rc1' into sched/urgentIngo Molnar2009-04-081-353/+788
|\ \ | |/
| * Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-04-061-3/+11
| |\
| | * hrtimer: fix rq->lock inversion (again)Peter Zijlstra2009-03-311-3/+11
| * | Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-04-051-4/+4
| |\ \
| | * \ Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-021-4/+4
| | |\ \
| | | * \ Merge branch 'x86/core' into tracing/texteditIngo Molnar2009-03-061-9/+4
| | | |\ \
| | | * \ \ Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-041-3/+68
| | | |\ \ \
| | | * \ \ \ Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/coreIngo Molnar2009-03-041-3/+12
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'linus' into tracing/blktraceIngo Molnar2009-02-191-3/+12
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 't...Ingo Molnar2009-02-131-16/+11
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge commit 'v2.6.29-rc4' into tracing/coreIngo Molnar2009-02-091-2/+2
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing...Ingo Molnar2009-02-031-0/+10
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | trace, lockdep: manual preempt count adding for local_bh_disableSteven Rostedt2009-01-231-4/+4
| * | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumaskLinus Torvalds2009-04-051-21/+22
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Rusty Russell2009-03-311-21/+22
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'linus' into cpumask-for-linusIngo Molnar2009-03-301-289/+692
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | cpumask: remove cpumask allocation from idle_balance, fixRusty Russell2009-03-191-1/+1
| | | * | | | | | | | | | | cpumask: remove cpumask allocation from idle_balanceRusty Russell2009-03-191-17/+18
| | | * | | | | | | | | | | cpumask: use topology_core_cpumask/topology_thread_cpumask instead of cpu_cor...Rusty Russell2009-03-131-4/+4
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge branch 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2009-04-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'x86/core' into core/ipiIngo Molnar2009-03-131-9/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge branch 'x86/urgent' into x86/coreIngo Molnar2009-03-051-3/+12
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | * | | | | | | | | | | Merge branch 'linus' into core/ipiIngo Molnar2009-03-131-3/+12
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | generic-ipi: remove CSD_FLAG_WAITPeter Zijlstra2009-02-251-1/+1
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | epoll keyed wakeups: add __wake_up_locked_key() and __wake_up_sync_key()Davide Libenzi2009-04-011-4/+19
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-03-301-3/+68
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | sched: fix errors in struct & function commentsRandy Dunlap2009-03-291-7/+8
| * | | | | | | | | Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-271-9/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Ingo Molnar2009-02-241-3/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | alloc_percpu: change percpu_ptr to per_cpu_ptrRusty Russell2009-02-201-3/+3
| | | * | | | | | | | Merge commit 'v2.6.29-rc4' into core/percpuIngo Molnar2009-02-091-2/+12
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | * | | | | | | | | Merge branch 'linus' into x86/apicIngo Molnar2009-02-221-3/+12
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'linus' into x86/apicIngo Molnar2009-02-131-18/+13
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'x86/urgent' into x86/apicIngo Molnar2009-02-051-0/+10
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge branch 'x86/mm' into core/percpuIngo Molnar2009-01-211-18/+25
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge branch 'core/percpu' into stackprotectorIngo Molnar2009-01-181-479/+639
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'linus' into stackprotectorIngo Molnar2008-12-311-239/+301
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'linus' into stackprotectorIngo Molnar2008-10-151-590/+1094
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into stackprotectorIngo Molnar2008-06-251-425/+92
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | stackprotector: use canary at end of stack to indicate overruns at oops timeEric Sandeen2008-05-261-6/+1