Stephen Frost (sfrost@ns.snowman.net)
Wed, 4 Nov 1998 11:44:37 -0500 (EST)
Okay, fixed, here's the patch for everything in drivers/block/paride, this
patch is against 2.1.127-7:
diff -u --recursive --new-file linux-2.1.127/drivers/block/paride/pcd.c linux/drivers/block/paride/pcd.
c
--- linux-2.1.127/drivers/block/paride/pcd.c Mon Sep 28 13:51:16 1998
+++ linux/drivers/block/paride/pcd.c Wed Nov 4 11:16:13 1998
@@ -559,8 +559,7 @@
static void pcd_sleep( int cs )
{ current->state = TASK_INTERRUPTIBLE;
- current->timeout = jiffies + cs;
- schedule();
+ schedule_timeout(cs);
}
static int pcd_reset( int unit )
diff -u --recursive --new-file linux-2.1.127/drivers/block/paride/pf.c linux/drivers/block/paride/pf.c
--- linux-2.1.127/drivers/block/paride/pf.c Mon Sep 28 13:51:16 1998
+++ linux/drivers/block/paride/pf.c Wed Nov 4 11:16:09 1998
@@ -660,8 +660,7 @@
static void pf_sleep( int cs )
{ current->state = TASK_INTERRUPTIBLE;
- current->timeout = jiffies + cs;
- schedule();
+ schedule_timeout(cs);
}
diff -u --recursive --new-file linux-2.1.127/drivers/block/paride/pg.c linux/drivers/block/paride/pg.c
--- linux-2.1.127/drivers/block/paride/pg.c Mon Sep 28 13:51:16 1998
+++ linux/drivers/block/paride/pg.c Wed Nov 4 11:16:01 1998
@@ -357,8 +357,7 @@
static void pg_sleep( int cs )
{ current->state = TASK_INTERRUPTIBLE;
- current->timeout = jiffies + cs;
- schedule();
+ schedule_timeout(cs);
}
static int pg_wait( int unit, int go, int stop, int tmo, char * msg )
diff -u --recursive --new-file linux-2.1.127/drivers/block/paride/pt.c linux/drivers/block/paride/pt.c
--- linux-2.1.127/drivers/block/paride/pt.c Mon Sep 28 13:51:16 1998
+++ linux/drivers/block/paride/pt.c Wed Nov 4 11:15:56 1998
@@ -464,8 +464,7 @@
static void pt_sleep( int cs )
{ current->state = TASK_INTERRUPTIBLE;
- current->timeout = jiffies + cs;
- schedule();
+ schedule_timeout(cs);
}
static int pt_poll_dsc( int unit, int pause, int tmo, char *msg )
---On Wed, 4 Nov 1998, Stephen Frost wrote:
> > paride failed to compile under 2.1.127-7, 2.1.127-3 worked fine, attempting > to compile it as a module. Havn't looked into the error much yet, but I may be able > to come up w/ a patch in a bit. > > Stephen > > gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -DCPU=586 -DMODULE -c -o pd.o pd.c > pseudo.h:48: warning: `ps_spinlock' defined but not used > gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -DCPU=586 -DMODULE -c -o pcd.o pcd.c > pcd.c: In function `pcd_sleep': > pcd.c:562: structure has no member named `timeout' > pseudo.h: At top level: > pseudo.h:48: warning: `ps_spinlock' defined but not used > make[3]: *** [pcd.o] Error 1 > make[3]: Leaving directory `/usr/src/linux-2.1.127/drivers/block/paride' > make[2]: *** [_modinsubdir_paride] Error 2 > make[2]: Leaving directory `/usr/src/linux-2.1.127/drivers/block' > make[1]: *** [_modsubdir_block] Error 2 > make[1]: Leaving directory `/usr/src/linux-2.1.127/drivers' > make: *** [_mod_drivers] Error 2 > ls: *.o: No such file or directory > > > - > 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/ >
-- To unsubscribe, send mail to: linux-parport-request@torque.net -- -- with the single word "unsubscribe" in the body of the message. --
This archive was generated by hypermail 2.0b3 on Wed 30 Dec 1998 - 10:18:44 EST