From: Alexey Dobriyan Sucker is remove-timer-debug-fields.patch CC arch/s390/kernel/vtime.o arch/s390/kernel/vtime.c: In function `init_virt_timer': arch/s390/kernel/vtime.c:280: error: `TIMER_MAGIC' undeclared ---------------------------------------------------------------------------- Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton --- arch/s390/kernel/vtime.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff -puN arch/s390/kernel/vtime.c~remove-timer-debug-fields-fix arch/s390/kernel/vtime.c --- 25/arch/s390/kernel/vtime.c~remove-timer-debug-fields-fix Tue Oct 11 14:34:48 2005 +++ 25-akpm/arch/s390/kernel/vtime.c Tue Oct 11 14:34:48 2005 @@ -24,7 +24,6 @@ #include #include -#define VTIMER_MAGIC (TIMER_MAGIC + 1) static ext_int_info_t ext_int_info_timer; DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer); @@ -277,20 +276,12 @@ static void do_cpu_timer_interrupt(struc void init_virt_timer(struct vtimer_list *timer) { - timer->magic = VTIMER_MAGIC; timer->function = NULL; INIT_LIST_HEAD(&timer->entry); spin_lock_init(&timer->lock); } EXPORT_SYMBOL(init_virt_timer); -static inline int check_vtimer(struct vtimer_list *timer) -{ - if (timer->magic != VTIMER_MAGIC) - return -EINVAL; - return 0; -} - static inline int vtimer_pending(struct vtimer_list *timer) { return (!list_empty(&timer->entry)); @@ -346,7 +337,7 @@ static void internal_add_vtimer(struct v static inline int prepare_vtimer(struct vtimer_list *timer) { - if (check_vtimer(timer) || !timer->function) { + if (!timer->function) { printk("add_virt_timer: uninitialized timer\n"); return -EINVAL; } @@ -414,7 +405,7 @@ int mod_virt_timer(struct vtimer_list *t unsigned long flags; int cpu; - if (check_vtimer(timer) || !timer->function) { + if (!timer->function) { printk("mod_virt_timer: uninitialized timer\n"); return -EINVAL; } @@ -481,11 +472,6 @@ int del_virt_timer(struct vtimer_list *t unsigned long flags; struct vtimer_queue *vt_list; - if (check_vtimer(timer)) { - printk("del_virt_timer: timer not initialized\n"); - return -EINVAL; - } - /* check if timer is pending */ if (!vtimer_pending(timer)) return 0; _