From: Thomas Gleixner Fixup the conversion of posix-timers to hrtimers. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton --- kernel/posix-timers.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN kernel/posix-timers.c~hrtimers-fix-possible-use-of-null-pointer-in kernel/posix-timers.c --- devel/kernel/posix-timers.c~hrtimers-fix-possible-use-of-null-pointer-in 2006-01-19 20:11:19.000000000 -0800 +++ devel-akpm/kernel/posix-timers.c 2006-01-19 20:11:19.000000000 -0800 @@ -290,7 +290,8 @@ void do_schedule_next_timer(struct sigin info->si_overrun = timr->it_overrun_last; } - unlock_timer(timr, flags); + if (timr) + unlock_timer(timr, flags); } int posix_timer_event(struct k_itimer *timr,int si_private) _