Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimers: Reorder clock bases hrtimers: Avoid touching inactive timer bases hrtimers: Make struct hrtimer_cpu_base layout less stupid timerfd: Manage cancelable timers in timerfd clockevents: Move C3 stop test outside lock alarmtimer: Drop device refcount after rtc_open() alarmtimer: Check return value of class_find_device() timerfd: Allow timers to be cancelled when clock was set hrtimers: Prepare for cancel on clock was set timers
Showing
- fs/timerfd.c 95 additions, 7 deletionsfs/timerfd.c
- include/linux/hrtimer.h 16 additions, 17 deletionsinclude/linux/hrtimer.h
- include/linux/thread_info.h 1 addition, 1 deletioninclude/linux/thread_info.h
- include/linux/timerfd.h 2 additions, 1 deletioninclude/linux/timerfd.h
- kernel/hrtimer.c 85 additions, 77 deletionskernel/hrtimer.c
- kernel/posix-cpu-timers.c 2 additions, 2 deletionskernel/posix-cpu-timers.c
- kernel/posix-timers.c 1 addition, 1 deletionkernel/posix-timers.c
- kernel/time/alarmtimer.c 12 additions, 4 deletionskernel/time/alarmtimer.c
- kernel/time/tick-broadcast.c 9 additions, 7 deletionskernel/time/tick-broadcast.c
- kernel/time/timekeeping.c 16 additions, 1 deletionkernel/time/timekeeping.c
Loading
Please register or sign in to comment