Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

cefef3a7

Commit cefef3a7 authored 8 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 92d21ac7 748c7201

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/kernel/kvm.c 0 additions, 2 deletions

arch/x86/kernel/kvm.c
include/linux/sched.h 6 additions, 2 deletions

include/linux/sched.h
kernel/exit.c 76 additions, 0 deletions

kernel/exit.c
kernel/sched/core.c 81 additions, 33 deletions

kernel/sched/core.c
kernel/sched/cpuacct.c 73 additions, 41 deletions

kernel/sched/cpuacct.c
kernel/sched/cputime.c 9 additions, 7 deletions

kernel/sched/cputime.c
kernel/sched/debug.c 1 addition, 1 deletion

kernel/sched/debug.c
kernel/sched/fair.c 163 additions, 88 deletions

kernel/sched/fair.c
kernel/sched/idle.c 3 additions, 1 deletion

kernel/sched/idle.c
kernel/sched/sched.h 6 additions, 15 deletions

kernel/sched/sched.h

with 418 additions and 190 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment