Merge branch 'v28-timers-for-linus' of...
Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits) fix documentation of sysrq-q really Fix documentation of sysrq-q timer_list: add base address to clock base timer_list: print cpu number of clockevents device timer_list: print real timer address NOHZ: restart tick device from irq_enter() NOHZ: split tick_nohz_restart_sched_tick() NOHZ: unify the nohz function calls in irq_enter() timers: fix itimer/many thread hang, fix timers: fix itimer/many thread hang, v3 ntp: improve adjtimex frequency rounding timekeeping: fix rounding problem during clock update ntp: let update_persistent_clock() sleep hrtimer: reorder struct hrtimer to save 8 bytes on 64bit builds posix-timers: lock_timer: make it readable posix-timers: lock_timer: kill the bogus ->it_id check posix-timers: kill ->it_sigev_signo and ->it_sigev_value posix-timers: sys_timer_create: cleanup the error handling posix-timers: move the initialization of timer->sigq from send to create path posix-timers: sys_timer_create: simplify and s/tasklist/rcu/ ... Fix trivial conflicts due to sysrq-q description clahes in Documentation/sysrq.txt and drivers/char/sysrq.c
Showing
- Documentation/sysrq.txt 3 additions, 2 deletionsDocumentation/sysrq.txt
- drivers/char/sysrq.c 1 addition, 1 deletiondrivers/char/sysrq.c
- drivers/clocksource/acpi_pm.c 5 additions, 2 deletionsdrivers/clocksource/acpi_pm.c
- fs/binfmt_elf.c 7 additions, 12 deletionsfs/binfmt_elf.c
- fs/proc/array.c 4 additions, 4 deletionsfs/proc/array.c
- include/linux/clocksource.h 10 additions, 4 deletionsinclude/linux/clocksource.h
- include/linux/hrtimer.h 2 additions, 8 deletionsinclude/linux/hrtimer.h
- include/linux/kernel_stat.h 1 addition, 0 deletionsinclude/linux/kernel_stat.h
- include/linux/posix-timers.h 2 additions, 2 deletionsinclude/linux/posix-timers.h
- include/linux/sched.h 71 additions, 13 deletionsinclude/linux/sched.h
- include/linux/tick.h 3 additions, 4 deletionsinclude/linux/tick.h
- include/linux/time.h 5 additions, 0 deletionsinclude/linux/time.h
- include/linux/timex.h 9 additions, 2 deletionsinclude/linux/timex.h
- kernel/compat.c 14 additions, 39 deletionskernel/compat.c
- kernel/exit.c 10 additions, 9 deletionskernel/exit.c
- kernel/fork.c 50 additions, 42 deletionskernel/fork.c
- kernel/hrtimer.c 7 additions, 8 deletionskernel/hrtimer.c
- kernel/itimer.c 10 additions, 23 deletionskernel/itimer.c
- kernel/posix-cpu-timers.c 260 additions, 252 deletionskernel/posix-cpu-timers.c
- kernel/posix-timers.c 61 additions, 92 deletionskernel/posix-timers.c
Loading
Please register or sign in to comment