Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull NOHZ updates from Ingo Molnar: "The main changes, mostly written by Frederic Weisbecker, include: - Fix some jiffies based cputime assumptions. (No real harm because the concerned code isn't used by full dynticks.) - Simplify jiffies <-> usecs conversions. Remove dead code. - Remove early hacks on nohz full code that avoided messing up idle nohz internals. Now nohz integrates well full and idle and such hack have become needless. - Restart nohz full tick from irq exit. (A simplification and a preparation for future optimization on scheduler kick to nohz full) - Code cleanups. - Tile driver isolation enhancement on top of nohz. (Chris Metcalf)" * 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: nohz: Remove useless argument on tick_nohz_task_switch() nohz: Move tick_nohz_restart_sched_tick() above its users nohz: Restart nohz full tick from irq exit nohz: Remove idle task special case nohz: Prevent tilegx network driver interrupts alpha: Fix jiffies based cputime assumption apm32: Fix cputime == jiffies assumption jiffies: Remove HZ > USEC_PER_SEC special case
Showing
- arch/alpha/kernel/osf_sys.c 9 additions, 4 deletionsarch/alpha/kernel/osf_sys.c
- arch/x86/kernel/apm_32.c 1 addition, 1 deletionarch/x86/kernel/apm_32.c
- drivers/net/ethernet/tile/tilegx.c 3 additions, 1 deletiondrivers/net/ethernet/tile/tilegx.c
- include/linux/jiffies.h 1 addition, 8 deletionsinclude/linux/jiffies.h
- include/linux/tick.h 13 additions, 12 deletionsinclude/linux/tick.h
- kernel/sched/core.c 1 addition, 1 deletionkernel/sched/core.c
- kernel/time/tick-sched.c 27 additions, 45 deletionskernel/time/tick-sched.c
- kernel/time/time.c 7 additions, 3 deletionskernel/time/time.c
Please register or sign in to comment