summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2012-12-1226-335/+1082
|\
| * Revert "sched/autogroup: Fix crash on reboot when autogroup is disabled"Ingo Molnar2012-12-114-14/+147
| * Merge tag 'sched-cputime-for-mingo' of git://git.kernel.org/pub/scm/linux/ker...Ingo Molnar2012-12-0810-55/+65
| |\
| | * vtime: Warn if irqs aren't disabled on system time accounting APIsFrederic Weisbecker2012-11-203-0/+6
| | * vtime: No need to disable irqs on vtime_account()Frederic Weisbecker2012-11-191-6/+0
| | * vtime: Consolidate a bit the ctx switch codeFrederic Weisbecker2012-11-196-14/+19
| | * vtime: Explicitly account pending user time on process tickFrederic Weisbecker2012-11-195-18/+23
| | * vtime: Remove the underscore prefix invasionFrederic Weisbecker2012-11-196-20/+20
| * | Merge tag 'cputime-adjustment-cleanups' of git://git.kernel.org/pub/scm/linux...Ingo Molnar2012-12-0813-205/+119
| |\ \
| | * | cputime: Comment cputime's adjusting codeFrederic Weisbecker2012-11-281-2/+16
| | * | cputime: Consolidate cputime adjustment codeFrederic Weisbecker2012-11-283-28/+43
| | * | cputime: Rename thread_group_times to thread_group_cputime_adjustedFrederic Weisbecker2012-11-285-13/+13
| | * | cputime: Move thread_group_cputime() to sched codeFrederic Weisbecker2012-11-282-24/+28
| | * | Merge branch 'sched/urgent' into sched/coreIngo Molnar2012-11-186-148/+20
| | |\ \
| | | * | sched/autogroup: Fix crash on reboot when autogroup is disabledMike Galbraith2012-10-304-147/+14
| | | * | sched: Add WAKEUP_PREEMPTION feature flag, on by defaultIngo Molnar2012-10-162-1/+6
| | * | | Merge tag 'v3.7-rc5' into sched/coreIngo Molnar2012-11-14693-4929/+8073
| | |\ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'linus' into sched/coreIngo Molnar2012-12-071121-8022/+13298
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge tag 'cputime-cleanups-for-mingo' of git://git.kernel.org/pub/scm/linux/...Ingo Molnar2012-10-3010-40/+89
| |\ \ \ \
| | * | | | cputime: Separate irqtime accounting from generic vtimeFrederic Weisbecker2012-10-292-12/+10
| | * | | | cputime: Specialize irq vtime hooksFrederic Weisbecker2012-10-293-5/+30
| | * | | | kvm: Directly account vtime to system on guest switchFrederic Weisbecker2012-10-292-6/+10
| | * | | | vtime: Make vtime_account_system() irqsafeFrederic Weisbecker2012-10-295-10/+26
| | * | | | vtime: Gather vtime declarations to their own header fileFrederic Weisbecker2012-10-293-18/+24
| |/ / / /
| * | | | sched: Describe CFS load-balancerPeter Zijlstra2012-10-241-2/+116
| * | | | sched: Introduce temporary FAIR_GROUP_SCHED dependency for load-trackingPaul Turner2012-10-244-5/+32
| * | | | sched: Make __update_entity_runnable_avg() fastPaul Turner2012-10-241-24/+101
| * | | | sched: Update_cfs_shares at period edgePaul Turner2012-10-241-8/+10
| * | | | sched: Refactor update_shares_cpu() -> update_blocked_avgs()Paul Turner2012-10-241-27/+23
| * | | | sched: Replace update_shares weight distribution with per-entity computationPaul Turner2012-10-243-165/+36
| * | | | sched: Maintain runnable averages across throttled periodsPaul Turner2012-10-242-11/+42
| * | | | sched: Normalize tg load contributions against runnable timePaul Turner2012-10-243-0/+62
| * | | | sched: Compute load contribution by a group entityPaul Turner2012-10-241-6/+27
| * | | | sched: Aggregate total task_group loadPaul Turner2012-10-243-0/+30
| * | | | sched: Account for blocked load waking back upPaul Turner2012-10-242-21/+81
| * | | | sched: Add an rq migration call-back to sched_classPaul Turner2012-10-243-0/+15
| * | | | sched: Maintain the load contribution of blocked entitiesPaul Turner2012-10-245-15/+122
| * | | | sched: Aggregate load contributed by task entities on parenting cfs_rqPaul Turner2012-10-244-5/+60
| * | | | sched: Maintain per-rq runnable averagesBen Segall2012-10-243-4/+26
| * | | | sched: Track the runnable average on a per-task entity basisPaul Turner2012-10-244-0/+151
* | | | | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-12-122-4/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel...Ingo Molnar2012-12-082-4/+14
| |\ \ \ \ \
| | * | | | | ring-buffer: Fix race between integrity check and readersSteven Rostedt2012-11-301-1/+6
| | * | | | | ring-buffer: Fix NULL pointer if rb_set_head_page() failsSteven Rostedt2012-11-301-2/+7
| | * | | | | ftrace: Clear bits properly in reset_iter_read()Dan Carpenter2012-11-151-1/+1
* | | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2012-12-12211-4116/+8328
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2012-12-0837-111/+176
| |\ \ \ \ \ \ \
| | * | | | | | | tracing: Kill unused and puzzled sample code in ftrace.hShan Wei2012-11-131-73/+0
| | * | | | | | | tracing: Show raw time stamp on stats per cpu using counter or tsc mode for t...Yoshihiro YUNOMAE2012-11-131-6/+17
| | * | | | | | | tracing: Format non-nanosec times from tsc clock without a decimal point.David Sharp2012-11-135-33/+72