From: Li Zefan Function do_timer_interrupt_hook() don't take argument regs, and structure hrtimer_sleeper don't have member cb_pending. So delete comments refering to these symbols. Signed-off-by: Li Zefan Cc: Thomas Gleixner Cc: Ingo Molnar Cc: john stultz Signed-off-by: Andrew Morton --- include/asm-x86/mach-voyager/do_timer.h | 1 - include/linux/hrtimer.h | 1 - 2 files changed, 2 deletions(-) diff -puN include/asm-x86/mach-voyager/do_timer.h~time-delete-comments-that-refer-to-noexistent-symbols include/asm-x86/mach-voyager/do_timer.h --- a/include/asm-x86/mach-voyager/do_timer.h~time-delete-comments-that-refer-to-noexistent-symbols +++ a/include/asm-x86/mach-voyager/do_timer.h @@ -6,7 +6,6 @@ /** * do_timer_interrupt_hook - hook into timer tick - * @regs: standard registers from interrupt * * Call the pit clock event handler. see asm/i8253.h **/ diff -puN include/linux/hrtimer.h~time-delete-comments-that-refer-to-noexistent-symbols include/linux/hrtimer.h --- a/include/linux/hrtimer.h~time-delete-comments-that-refer-to-noexistent-symbols +++ a/include/linux/hrtimer.h @@ -147,7 +147,6 @@ struct hrtimer_sleeper { * @get_time: function to retrieve the current time of the clock * @get_softirq_time: function to retrieve the current time from the softirq * @softirq_time: the time when running the hrtimer queue in the softirq - * @cb_pending: list of timers where the callback is pending * @offset: offset of this clock to the monotonic base * @reprogram: function to reprogram the timer event */ _