Messages in this thread | | | Date | Wed, 14 Oct 1998 12:49:12 +0200 (CEST) | From | Andrea Arcangeli <> | Subject | Re: 2.1.125 Show stopper list: Draft |
| |
On Wed, 14 Oct 1998, Andrea Arcangeli wrote:
>On Wed, 14 Oct 1998, Vojtech Pavlik wrote: > >>On Tue, Oct 13, 1998 at 06:31:55PM +0200, Andrea Arcangeli wrote: >> >>> Index: linux/drivers/char/joystick.c >>> diff -u linux/drivers/char/joystick.c:1.1.1.1 linux/drivers/char/joystick.c:1.1.1.1.12.1 >>> --- linux/drivers/char/joystick.c:1.1.1.1 Fri Oct 2 19:23:15 1998 >>> +++ linux/drivers/char/joystick.c Tue Oct 13 17:28:28 1998 >>> @@ -222,7 +222,7 @@ >>> } >>> } >>> else >>> - if ((jiffies > js_bh_time + JS_BH_MAX_PERIOD) && !js_mark_time) { >>> + if (time_after(jiffies, js_bh_time + JS_BH_MAX_PERIOD) && !js_mark_time) { >>> js_mark_time = jiffies; >>> mark_bh(JS_BH); >>> } >>> @@ -285,7 +285,7 @@ >>> int i, j, k; >>> unsigned int t; >>> >>> - if (jiffies > js_bh_time + JS_BH_MIN_PERIOD) { >>> + if (time_after(jiffies, js_bh_time + JS_BH_MIN_PERIOD)) { >>> >>> unsigned int old_axis[4]; >>> unsigned int t_low, t_high; >> >>There isn't anything like that in the 2.1.125 joystick driver. There isn't >>even a linux/drivers/char/joystick.c. Are you sure this patch is against 2.1.125? > >Probably I have messed up something in cvs. I' ll check... Thanks.
Yes these files got not deleted at 2.1.125 merging time (don' t ask me why ;-):
arch/m68k/mac/psc.h | 18 drivers/char/joystick.c | 861 ------------------------ drivers/scsi/aic7xxx_seq.h | 524 -------------- include/asm-m68k/xstat.h | 35
I am fixing my tree now.
So remove the joystick.c part of the patch and the rest should be fine.
Thanks.
Andrea Arcangeli
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |