> On Wed, 3 Jun 1998, Alan Cox wrote:
>
> > > 2.0 has some known races and deadlocks in the quota code. I've send the
> > > reporter some fixes, but I'm still waiting for feedback. It would be nice if
> > > those could be incorporated into 2.0.34.
> >
> > They can go into 2.0.35. Any change now invalidates all the hard testing
> > done in 2.0.34. So once Linus ships 2.0.34 send me the diffs
>
> Well, this patch could make it into either one, it's really harmless. It
> fixes some compiler warnings, mostly variables declared implicitly as int.
... I forgot to attach the patch, didn't I? Here it comes...
Ion
--
It is better to keep your mouth shut and be thought a fool,
than to open it and remove all doubt.
------------------------------------
diff -urN linux-2.0.34pre16/drivers/block/ide-cd.c linux-2.0.34/drivers/block/ide-cd.c
--- linux-2.0.34pre16/drivers/block/ide-cd.c Fri May 29 23:41:38 1998
+++ linux-2.0.34/drivers/block/ide-cd.c Sat May 30 14:39:31 1998
@@ -2414,7 +2414,9 @@
case CDROMREADMODE2: {
struct cdrom_msf msf;
int blocksize, format, stat, lba;
+#if 0
struct atapi_toc *toc;
+#endif
char *buf;
if (cmd == CDROMREADMODE1) {
@@ -2425,7 +2427,7 @@
format = 3;
} else {
blocksize = CD_FRAMESIZE_RAW;
- format = 0;
+ format = 0;
}
stat = verify_area (VERIFY_WRITE, (char *)arg, blocksize);
@@ -2436,15 +2438,17 @@
lba = msf_to_lba (msf.cdmsf_min0,
msf.cdmsf_sec0,
msf.cdmsf_frame0);
-
+
/* DON'T make sure the TOC is up to date. */
- /* stat = cdrom_read_toc (drive, NULL);
+#if 0
+ stat = cdrom_read_toc (drive, NULL);
if (stat) return stat;
toc = drive->cdrom_info.toc;
if (lba < 0 || lba >= toc->capacity)
- return -EINVAL; */
+ return -EINVAL;
+#endif
buf = (char *) kmalloc (CD_FRAMESIZE_RAW, GFP_KERNEL);
if (buf == NULL)
diff -urN linux-2.0.34pre16/drivers/block/rd.c linux-2.0.34/drivers/block/rd.c
--- linux-2.0.34pre16/drivers/block/rd.c Fri May 29 23:41:38 1998
+++ linux-2.0.34/drivers/block/rd.c Sat May 30 14:38:00 1998
@@ -582,7 +582,7 @@
static unsigned insize = 0; /* valid bytes in inbuf */
static unsigned inptr = 0; /* index of next byte to be processed in inbuf */
static unsigned outcnt = 0; /* bytes in output buffer */
-static exit_code = 0;
+static int exit_code = 0;
static long bytes_out = 0;
static struct file *crd_infp, *crd_outfp;
diff -urN linux-2.0.34pre16/drivers/cdrom/cm206.c linux-2.0.34/drivers/cdrom/cm206.c
--- linux-2.0.34pre16/drivers/cdrom/cm206.c Sat Aug 17 14:19:26 1996
+++ linux-2.0.34/drivers/cdrom/cm206.c Sat May 30 15:25:55 1998
@@ -739,7 +739,7 @@
uch * q = cd->q;
uch ct; /* current track */
int binary=0;
- const skip = 3*60*75;
+ const int skip = 3*60*75;
for (i=track; i>0; i--) if (cd->toc[i].track) {
min = fsm2lba(cd->toc[i].fsm);
diff -urN linux-2.0.34pre16/drivers/char/ftape/ftape-bsm.h linux-2.0.34/drivers/char/ftape/ftape-bsm.h
--- linux-2.0.34pre16/drivers/char/ftape/ftape-bsm.h Wed Mar 6 08:07:19 1996
+++ linux-2.0.34/drivers/char/ftape/ftape-bsm.h Sat May 30 15:05:32 1998
@@ -44,7 +44,7 @@
/*
* ftape-io.c defined global vars.
*/
-extern bad_sector_map_changed;
+extern int bad_sector_map_changed;
/*
* ftape-io.c defined global functions.
diff -urN linux-2.0.34pre16/drivers/char/ftape/ftape-ctl.h linux-2.0.34/drivers/char/ftape/ftape-ctl.h
--- linux-2.0.34pre16/drivers/char/ftape/ftape-ctl.h Wed Oct 15 18:10:48 1997
+++ linux-2.0.34/drivers/char/ftape/ftape-ctl.h Sat May 30 15:05:04 1998
@@ -61,7 +61,7 @@
*/
extern int ftape_failure;
extern int write_protected;
-extern ftape_offline;
+extern int ftape_offline;
extern int formatted;
extern int no_tape;
extern history_record history;
diff -urN linux-2.0.34pre16/drivers/char/ftape/kernel-interface.h linux-2.0.34/drivers/char/ftape/kernel-interface.h
--- linux-2.0.34pre16/drivers/char/ftape/kernel-interface.h Wed Oct 15 18:10:48 1997
+++ linux-2.0.34/drivers/char/ftape/kernel-interface.h Sat May 30 15:04:36 1998
@@ -59,7 +59,7 @@
/* kernel global functions not (yet) standard accessible
* (linked at load time by modules package).
*/
-asmlinkage extern sys_sgetmask(void);
-asmlinkage extern sys_ssetmask(int);
+asmlinkage extern int sys_sgetmask(void);
+asmlinkage extern int sys_ssetmask(int);
#endif
diff -urN linux-2.0.34pre16/drivers/isdn/sc/interrupt.c linux-2.0.34/drivers/isdn/sc/interrupt.c
--- linux-2.0.34pre16/drivers/isdn/sc/interrupt.c Mon Aug 4 20:34:01 1997
+++ linux-2.0.34/drivers/isdn/sc/interrupt.c Sat May 30 15:26:49 1998
@@ -32,7 +32,7 @@
#include "message.h"
#include "card.h"
-extern indicate_status(int, int, ulong, char *);
+extern int indicate_status(int, int, ulong, char *);
extern void check_phystat(unsigned long);
extern void dump_messages(int);
extern int receivemessage(int, RspMessage *);
diff -urN linux-2.0.34pre16/drivers/net/3c503.c linux-2.0.34/drivers/net/3c503.c
--- linux-2.0.34pre16/drivers/net/3c503.c Fri Apr 12 02:49:36 1996
+++ linux-2.0.34/drivers/net/3c503.c Sat May 30 15:06:52 1998
@@ -75,7 +75,7 @@
static void el2_reset_8390(struct device *dev);
static void el2_init_card(struct device *dev);
static void el2_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static void el2_block_input(struct device *dev, int count, struct sk_buff *skb,
int ring_offset);
static void el2_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr,
@@ -432,7 +432,7 @@
*/
static void
el2_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page)
+ const unsigned char *buf, const int start_page)
{
unsigned short int *wrd;
int boguscount; /* timeout counter */
diff -urN linux-2.0.34pre16/drivers/net/3c515.c linux-2.0.34/drivers/net/3c515.c
--- linux-2.0.34pre16/drivers/net/3c515.c Fri May 29 23:41:38 1998
+++ linux-2.0.34/drivers/net/3c515.c Sat May 30 15:09:47 1998
@@ -18,9 +18,9 @@
/* "Knobs" that adjust features and parameters. */
/* Set the copy breakpoint for the copy-only-tiny-frames scheme.
Setting to > 1512 effectively disables this feature. */
-static const rx_copybreak = 200;
+static const int rx_copybreak = 200;
/* Allow setting MTU to a larger size, bypassing the normal ethernet setup. */
-static const mtu = 1500;
+static const int mtu = 1500;
/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
static int max_interrupt_work = 20;
diff -urN linux-2.0.34pre16/drivers/net/3c59x.c linux-2.0.34/drivers/net/3c59x.c
--- linux-2.0.34pre16/drivers/net/3c59x.c Fri May 29 23:41:39 1998
+++ linux-2.0.34/drivers/net/3c59x.c Sat May 30 15:09:59 1998
@@ -20,9 +20,9 @@
/* "Knobs" that adjust features and parameters. */
/* Set the copy breakpoint for the copy-only-tiny-frames scheme.
Setting to > 1512 effectively disables this feature. */
-static const rx_copybreak = 200;
+static const int rx_copybreak = 200;
/* Allow setting MTU to a larger size, bypassing the normal ethernet setup. */
-static const mtu = 1500;
+static const int mtu = 1500;
/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
static int max_interrupt_work = 20;
diff -urN linux-2.0.34pre16/drivers/net/at1700.c linux-2.0.34/drivers/net/at1700.c
--- linux-2.0.34pre16/drivers/net/at1700.c Fri May 29 23:41:39 1998
+++ linux-2.0.34/drivers/net/at1700.c Sat May 30 15:09:14 1998
@@ -595,7 +595,9 @@
/* The inverse routine to net_open(). */
static int net_close(struct device *dev)
{
+#if 0
struct net_local *lp = (struct net_local *)dev->priv;
+#endif
int ioaddr = dev->base_addr;
dev->tbusy = 1;
diff -urN linux-2.0.34pre16/drivers/net/dgrs.c linux-2.0.34/drivers/net/dgrs.c
--- linux-2.0.34pre16/drivers/net/dgrs.c Tue Aug 12 19:05:23 1997
+++ linux-2.0.34/drivers/net/dgrs.c Sat May 30 15:13:44 1998
@@ -405,7 +405,7 @@
*/
udelay(1);
- csr = (volatile) priv->vplxdma[PLX_DMA_CSR/4];
+ csr = (volatile int) priv->vplxdma[PLX_DMA_CSR/4];
if (csr & PLX_DMA_CSR_0_DONE)
break;
@@ -876,7 +876,7 @@
/* Wait for old command to finish */
for (i = 0; i < 1000; ++i)
{
- if ( (volatile) privN->bcomm->bc_filter_cmd <= 0 )
+ if ( (volatile int) privN->bcomm->bc_filter_cmd <= 0 )
break;
udelay(1);
}
diff -urN linux-2.0.34pre16/drivers/net/e2100.c linux-2.0.34/drivers/net/e2100.c
--- linux-2.0.34pre16/drivers/net/e2100.c Fri Mar 1 00:50:43 1996
+++ linux-2.0.34/drivers/net/e2100.c Sat May 30 15:08:40 1998
@@ -101,7 +101,7 @@
static void e21_block_input(struct device *dev, int count,
struct sk_buff *skb, int ring_offset);
static void e21_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static void e21_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr,
int ring_page);
@@ -330,7 +330,7 @@
static void
e21_block_output(struct device *dev, int count, const unsigned char *buf,
- int start_page)
+ const int start_page)
{
short ioaddr = dev->base_addr;
volatile char *shared_mem = (char *)dev->mem_start;
diff -urN linux-2.0.34pre16/drivers/net/eth16i.c linux-2.0.34/drivers/net/eth16i.c
--- linux-2.0.34pre16/drivers/net/eth16i.c Fri May 29 23:41:39 1998
+++ linux-2.0.34/drivers/net/eth16i.c Sat May 30 15:12:37 1998
@@ -714,7 +714,7 @@
creg[0] &= 0x0F; /* Mask collision cnr */
creg[2] &= 0x7F; /* Mask DCLEN bit */
-#ifdef 0
+#if 0
/*
This was removed because the card was sometimes left to state
from which it couldn't be find anymore. If there is need
diff -urN linux-2.0.34pre16/drivers/net/hp-plus.c linux-2.0.34/drivers/net/hp-plus.c
--- linux-2.0.34pre16/drivers/net/hp-plus.c Fri Mar 1 00:50:44 1996
+++ linux-2.0.34/drivers/net/hp-plus.c Sat May 30 15:07:34 1998
@@ -101,13 +101,13 @@
static void hpp_mem_block_input(struct device *dev, int count,
struct sk_buff *skb, int ring_offset);
static void hpp_mem_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static void hpp_mem_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr,
int ring_page);
static void hpp_io_block_input(struct device *dev, int count,
struct sk_buff *skb, int ring_offset);
static void hpp_io_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static void hpp_io_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr,
int ring_page);
@@ -385,7 +385,7 @@
It's always safe to round up, so we do. */
static void
hpp_io_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page)
+ const unsigned char *buf, const int start_page)
{
int ioaddr = dev->base_addr - NIC_OFFSET;
outw(start_page << 8, ioaddr + HPP_OUT_ADDR);
@@ -395,7 +395,7 @@
static void
hpp_mem_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page)
+ const unsigned char *buf, const int start_page)
{
int ioaddr = dev->base_addr - NIC_OFFSET;
int option_reg = inw(ioaddr + HPP_OPTION);
diff -urN linux-2.0.34pre16/drivers/net/hp.c linux-2.0.34/drivers/net/hp.c
--- linux-2.0.34pre16/drivers/net/hp.c Fri Mar 1 00:50:44 1996
+++ linux-2.0.34/drivers/net/hp.c Sat May 30 15:07:08 1998
@@ -65,7 +65,7 @@
static void hp_block_input(struct device *dev, int count,
struct sk_buff *skb , int ring_offset);
static void hp_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static void hp_init_card(struct device *dev);
@@ -309,7 +309,7 @@
static void
hp_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page)
+ const unsigned char *buf, const int start_page)
{
int nic_base = dev->base_addr;
int saved_config = inb_p(nic_base - NIC_OFFSET + HP_CONFIGURE);
diff -urN linux-2.0.34pre16/drivers/net/ne2k-pci.c linux-2.0.34/drivers/net/ne2k-pci.c
--- linux-2.0.34pre16/drivers/net/ne2k-pci.c Fri May 29 23:41:39 1998
+++ linux-2.0.34/drivers/net/ne2k-pci.c Sat May 30 15:10:15 1998
@@ -45,7 +45,7 @@
#include "8390.h"
/* Set statically or when loading the driver module. */
-static debug = 1;
+static int debug = 1;
/* Some defines that people can play with if so inclined. */
diff -urN linux-2.0.34pre16/drivers/net/ni52.c linux-2.0.34/drivers/net/ni52.c
--- linux-2.0.34pre16/drivers/net/ni52.c Tue Apr 8 11:47:46 1997
+++ linux-2.0.34/drivers/net/ni52.c Sat May 30 15:10:47 1998
@@ -984,7 +984,7 @@
}
#endif
-#ifdef 0
+#if 0
if(!at_least_one)
{
int i;
diff -urN linux-2.0.34pre16/drivers/net/smc-ultra.c linux-2.0.34/drivers/net/smc-ultra.c
--- linux-2.0.34pre16/drivers/net/smc-ultra.c Fri May 29 23:41:39 1998
+++ linux-2.0.34/drivers/net/smc-ultra.c Sat May 30 15:08:01 1998
@@ -75,13 +75,13 @@
static void ultra_block_input(struct device *dev, int count,
struct sk_buff *skb, int ring_offset);
static void ultra_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static void ultra_pio_get_hdr(struct device *dev, struct e8390_pkt_hdr *hdr,
int ring_page);
static void ultra_pio_input(struct device *dev, int count,
struct sk_buff *skb, int ring_offset);
static void ultra_pio_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static int ultra_close_card(struct device *dev);
@@ -385,7 +385,7 @@
}
static void ultra_pio_output(struct device *dev, int count,
- const unsigned char *buf, const start_page)
+ const unsigned char *buf, const int start_page)
{
int ioaddr = dev->base_addr - ULTRA_NIC_OFFSET; /* ASIC addr */
outb(0x00, ioaddr + IOPA); /* Set the address, LSB first. */
diff -urN linux-2.0.34pre16/drivers/net/smc-ultra32.c linux-2.0.34/drivers/net/smc-ultra32.c
--- linux-2.0.34pre16/drivers/net/smc-ultra32.c Fri May 29 23:41:39 1998
+++ linux-2.0.34/drivers/net/smc-ultra32.c Sat May 30 15:08:12 1998
@@ -68,7 +68,7 @@
static void ultra32_block_input(struct device *dev, int count,
struct sk_buff *skb, int ring_offset);
static void ultra32_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static int ultra32_close(struct device *dev);
#define ULTRA32_CMDREG 0 /* Offset to ASIC command register. */
diff -urN linux-2.0.34pre16/drivers/net/wd.c linux-2.0.34/drivers/net/wd.c
--- linux-2.0.34pre16/drivers/net/wd.c Fri Mar 1 00:50:49 1996
+++ linux-2.0.34/drivers/net/wd.c Sat May 30 15:06:06 1998
@@ -54,7 +54,7 @@
static void wd_block_input(struct device *dev, int count,
struct sk_buff *skb, int ring_offset);
static void wd_block_output(struct device *dev, int count,
- const unsigned char *buf, const start_page);
+ const unsigned char *buf, const int start_page);
static int wd_close_card(struct device *dev);
diff -urN linux-2.0.34pre16/drivers/net/yellowfin.c linux-2.0.34/drivers/net/yellowfin.c
--- linux-2.0.34pre16/drivers/net/yellowfin.c Fri May 29 23:41:39 1998
+++ linux-2.0.34/drivers/net/yellowfin.c Sat May 30 15:10:27 1998
@@ -38,7 +38,7 @@
/* Set the copy breakpoint for the copy-only-tiny-frames scheme.
Setting to > 1518 effectively disables this feature. */
-static const rx_copybreak = 100;
+static const int rx_copybreak = 100;
/* Keep the ring sizes a power of two for efficiency.
Making the Tx ring too large decreases the effectiveness of channel
diff -urN linux-2.0.34pre16/drivers/scsi/53c7,8xx.c linux-2.0.34/drivers/scsi/53c7,8xx.c
--- linux-2.0.34pre16/drivers/scsi/53c7,8xx.c Tue Jul 16 05:02:42 1996
+++ linux-2.0.34/drivers/scsi/53c7,8xx.c Sat May 30 15:34:29 1998
@@ -670,6 +670,7 @@
EXTENDED_MESSAGE, 2 /* length */, EXTENDED_WDTR, 1 /* 2^1 bytes */
};
+#ifdef UNUSED
/*
* Function : struct Scsi_Host *find_host (int host)
*
@@ -770,6 +771,7 @@
hostdata->options &= ~OPTION_DISCONNECT;
return 0;
}
+#endif
/*
* Function : static void NCR53c7x0_driver_init (struct Scsi_Host *host)
@@ -5401,6 +5403,7 @@
return size;
}
+#ifdef UNUSED
/*
* Function : static const char *ncr_state (int state)
*
@@ -5422,6 +5425,7 @@
default: return "unknown";
}
}
+#endif
/*
* Function : int NCR53c7xx_abort (Scsi_Cmnd *cmd)
diff -urN linux-2.0.34pre16/drivers/scsi/AM53C974.c linux-2.0.34/drivers/scsi/AM53C974.c
--- linux-2.0.34pre16/drivers/scsi/AM53C974.c Thu Feb 27 15:49:41 1997
+++ linux-2.0.34/drivers/scsi/AM53C974.c Sat May 30 15:01:22 1998
@@ -2204,7 +2204,7 @@
*
* Returns : status (SCSI_ABORT_SUCCESS)
**************************************************************************/
-int AM53C974_reset(Scsi_Cmnd *cmd)
+int AM53C974_reset(Scsi_Cmnd *cmd, unsigned int flags)
{
AM53C974_local_declare();
int i;
diff -urN linux-2.0.34pre16/drivers/scsi/AM53C974.h linux-2.0.34/drivers/scsi/AM53C974.h
--- linux-2.0.34pre16/drivers/scsi/AM53C974.h Tue Mar 11 18:40:02 1997
+++ linux-2.0.34/drivers/scsi/AM53C974.h Sat May 30 15:02:31 1998
@@ -290,7 +281,7 @@
int AM53C974_command(Scsi_Cmnd *SCpnt);
int AM53C974_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *));
int AM53C974_abort(Scsi_Cmnd *cmd);
-int AM53C974_reset (Scsi_Cmnd *cmd);
+int AM53C974_reset (Scsi_Cmnd *cmd, unsigned int flags);
#define AM53C974_local_declare() unsigned long io_port
#define AM53C974_setio(instance) io_port = instance->io_port
diff -urN linux-2.0.34pre16/drivers/scsi/NCR53c406a.c linux-2.0.34/drivers/scsi/NCR53c406a.c
--- linux-2.0.34pre16/drivers/scsi/NCR53c406a.c Fri Apr 12 02:49:40 1996
+++ linux-2.0.34/drivers/scsi/NCR53c406a.c Sat May 30 15:24:38 1998
@@ -729,7 +729,7 @@
}
int
-NCR53c406a_reset(Scsi_Cmnd *SCpnt){
+NCR53c406a_reset(Scsi_Cmnd *SCpnt, unsigned int flags){
DEB(printk("NCR53c406a_reset called\n"));
outb(C4_IMG, CONFIG4); /* Select reg set 0 */
outb(CHIP_RESET, CMD_REG);
diff -urN linux-2.0.34pre16/drivers/scsi/NCR53c406a.h linux-2.0.34/drivers/scsi/NCR53c406a.h
--- linux-2.0.34pre16/drivers/scsi/NCR53c406a.h Wed Feb 14 02:26:25 1996
+++ linux-2.0.34/drivers/scsi/NCR53c406a.h Sat May 30 15:35:59 1998
@@ -57,7 +57,7 @@
int NCR53c406a_command(Scsi_Cmnd *);
int NCR53c406a_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int NCR53c406a_abort(Scsi_Cmnd *);
-int NCR53c406a_reset(Scsi_Cmnd *);
+int NCR53c406a_reset(Scsi_Cmnd *, unsigned int);
int NCR53c406a_biosparm(Disk *, kdev_t, int []);
#endif /* _NCR53C406A_H */
diff -urN linux-2.0.34pre16/drivers/scsi/advansys.c linux-2.0.34/drivers/scsi/advansys.c
--- linux-2.0.34pre16/drivers/scsi/advansys.c Fri May 29 23:41:39 1998
+++ linux-2.0.34/drivers/scsi/advansys.c Sat May 30 15:14:38 1998
@@ -11123,8 +11123,10 @@
};
+#ifdef UNUSED
STATIC ushort _asc_mcode_size ASC_INITDATA = sizeof(_asc_mcode_buf);
STATIC ulong _asc_mcode_chksum ASC_INITDATA = 0x012A727FUL ;
+#endif
#define ASC_SYN_OFFSET_ONE_DISABLE_LIST 16
STATIC uchar _syn_offset_one_disable_cmd[ASC_SYN_OFFSET_ONE_DISABLE_LIST] =
diff -urN linux-2.0.34pre16/drivers/scsi/aha1542.c linux-2.0.34/drivers/scsi/aha1542.c
--- linux-2.0.34pre16/drivers/scsi/aha1542.c Fri Feb 28 18:14:18 1997
+++ linux-2.0.34/drivers/scsi/aha1542.c Sat May 30 15:32:54 1998
@@ -125,8 +125,8 @@
#define aha1542_intr_reset(base) outb(IRST, CONTROL(base))
#define WAIT(port, mask, allof, noneof) \
- { register WAITbits; \
- register WAITtimeout = WAITnexttimeout; \
+ { register int WAITbits; \
+ register int WAITtimeout = WAITnexttimeout; \
while (1) { \
WAITbits = inb(port) & (mask); \
if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \
@@ -138,8 +138,8 @@
/* Similar to WAIT, except we use the udelay call to regulate the
amount of time we wait. */
#define WAITd(port, mask, allof, noneof, timeout) \
- { register WAITbits; \
- register WAITtimeout = timeout; \
+ { register int WAITbits; \
+ register int WAITtimeout = timeout; \
while (1) { \
WAITbits = inb(port) & (mask); \
if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \
diff -urN linux-2.0.34pre16/drivers/scsi/dtc.c linux-2.0.34/drivers/scsi/dtc.c
--- linux-2.0.34pre16/drivers/scsi/dtc.c Fri May 29 23:41:40 1998
+++ linux-2.0.34/drivers/scsi/dtc.c Sat May 30 15:23:23 1998
@@ -176,7 +176,7 @@
base = NULL;
if (overrides[current_override].address)
- base = overrides[current_override].address;
+ base = (char *)overrides[current_override].address;
else
for (; !base && (current_base < NO_BASES); ++current_base) {
#if (DTCDEBUG & DTCDEBUG_INIT)
@@ -184,9 +184,9 @@
#endif
for (sig = 0; sig < NO_SIGNATURES; ++sig)
if (!bases[current_base].noauto && !memcmp
- (bases[current_base].address + signatures[sig].offset,
+ ((char *)(bases[current_base].address + signatures[sig].offset),
signatures[sig].string, strlen(signatures[sig].string))) {
- base = bases[current_base].address;
+ base = (char *)bases[current_base].address;
#if (DTCDEBUG & DTCDEBUG_INIT)
printk("scsi-dtc : detected board.\n");
#endif
diff -urN linux-2.0.34pre16/drivers/scsi/fdomain.c linux-2.0.34/drivers/scsi/fdomain.c
--- linux-2.0.34pre16/drivers/scsi/fdomain.c Fri Nov 7 13:16:23 1997
+++ linux-2.0.34/drivers/scsi/fdomain.c Sat May 30 15:33:42 1998
@@ -1002,7 +1002,7 @@
Write_FIFO_port = port_base + Write_FIFO;
Write_SCSI_Data_port = port_base + Write_SCSI_Data;
- fdomain_16x0_reset( NULL );
+ fdomain_16x0_reset( NULL, 0 );
if (fdomain_test_loopback()) {
#if DEBUG_DETECT
@@ -1887,7 +1887,7 @@
return SCSI_ABORT_SUCCESS;
}
-int fdomain_16x0_reset( Scsi_Cmnd *SCpnt )
+int fdomain_16x0_reset( Scsi_Cmnd *SCpnt, unsigned int flags )
{
#if DEBUG_RESET
static int called_once = 0;
diff -urN linux-2.0.34pre16/drivers/scsi/fdomain.h linux-2.0.34/drivers/scsi/fdomain.h
--- linux-2.0.34pre16/drivers/scsi/fdomain.h Fri Oct 13 01:38:18 1995
+++ linux-2.0.34/drivers/scsi/fdomain.h Sat May 30 15:33:11 1998
@@ -29,7 +29,7 @@
int fdomain_16x0_command( Scsi_Cmnd * );
int fdomain_16x0_abort( Scsi_Cmnd * );
const char *fdomain_16x0_info( struct Scsi_Host * );
-int fdomain_16x0_reset( Scsi_Cmnd * );
+int fdomain_16x0_reset( Scsi_Cmnd *, unsigned int );
int fdomain_16x0_queue( Scsi_Cmnd *, void (*done)(Scsi_Cmnd *) );
int fdomain_16x0_biosparam( Disk *, kdev_t, int * );
int fdomain_16x0_proc_info( char *buffer, char **start, off_t offset,
diff -urN linux-2.0.34pre16/drivers/scsi/g_NCR5380.c linux-2.0.34/drivers/scsi/g_NCR5380.c
--- linux-2.0.34pre16/drivers/scsi/g_NCR5380.c Sun Aug 17 15:49:25 1997
+++ linux-2.0.34/drivers/scsi/g_NCR5380.c Sat May 30 15:17:59 1998
@@ -614,7 +614,9 @@
int i;
struct Scsi_Host *scsi_ptr;
Scsi_Cmnd *ptr;
+#ifdef NCR5380_STATS
Scsi_Device *dev;
+#endif
struct NCR5380_hostdata *hostdata;
cli();
diff -urN linux-2.0.34pre16/drivers/scsi/pas16.c linux-2.0.34/drivers/scsi/pas16.c
--- linux-2.0.34pre16/drivers/scsi/pas16.c Mon May 6 05:26:11 1996
+++ linux-2.0.34/drivers/scsi/pas16.c Sat May 30 15:20:06 1998
@@ -510,7 +510,7 @@
register unsigned char *d = dst;
register unsigned short reg = (unsigned short) (instance->io_port +
P_DATA_REG_OFFSET);
- register i = len;
+ register int i = len;
int ii = 0;
while ( !(inb(instance->io_port + P_STATUS_REG_OFFSET) & P_ST_RDY) )
@@ -546,7 +546,7 @@
int len) {
register unsigned char *s = src;
register unsigned short reg = (instance->io_port + P_DATA_REG_OFFSET);
- register i = len;
+ register int i = len;
int ii = 0;
while ( !((inb(instance->io_port + P_STATUS_REG_OFFSET)) & P_ST_RDY) )
diff -urN linux-2.0.34pre16/drivers/scsi/qlogicfas.c linux-2.0.34/drivers/scsi/qlogicfas.c
--- linux-2.0.34pre16/drivers/scsi/qlogicfas.c Thu Jul 11 00:41:25 1996
+++ linux-2.0.34/drivers/scsi/qlogicfas.c Sat May 30 15:15:22 1998
@@ -656,7 +656,7 @@
/*----------------------------------------------------------------*/
/* reset SCSI bus */
-int qlogicfas_reset(Scsi_Cmnd * cmd)
+int qlogicfas_reset(Scsi_Cmnd * cmd, unsigned int flags)
{
qabort = 2;
ql_zap();
diff -urN linux-2.0.34pre16/drivers/scsi/qlogicfas.h linux-2.0.34/drivers/scsi/qlogicfas.h
--- linux-2.0.34pre16/drivers/scsi/qlogicfas.h Thu Jul 11 00:41:25 1996
+++ linux-2.0.34/drivers/scsi/qlogicfas.h Sat May 30 15:31:58 1998
@@ -6,7 +6,7 @@
int qlogicfas_command(Scsi_Cmnd *);
int qlogicfas_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
int qlogicfas_abort(Scsi_Cmnd *);
-int qlogicfas_reset(Scsi_Cmnd *);
+int qlogicfas_reset(Scsi_Cmnd *, unsigned int flags);
int qlogicfas_biosparam(Disk *, kdev_t, int[]);
#ifndef NULL
diff -urN linux-2.0.34pre16/drivers/scsi/sd.c linux-2.0.34/drivers/scsi/sd.c
--- linux-2.0.34pre16/drivers/scsi/sd.c Fri May 29 23:41:40 1998
+++ linux-2.0.34/drivers/scsi/sd.c Sat May 30 14:51:58 1998
@@ -76,7 +76,7 @@
static int check_scsidisk_media_change(kdev_t);
static int fop_revalidate_scsidisk(kdev_t);
-static sd_init_onedisk(int);
+static int sd_init_onedisk(int);
static void requeue_sd_request (Scsi_Cmnd * SCpnt);
diff -urN linux-2.0.34pre16/drivers/scsi/seagate.h linux-2.0.34/drivers/scsi/seagate.h
--- linux-2.0.34pre16/drivers/scsi/seagate.h Mon May 27 06:37:18 1996
+++ linux-2.0.34/drivers/scsi/seagate.h Sat May 30 15:34:46 1998
@@ -40,9 +40,10 @@
/*
defining PARITY causes parity data to be checked
-*/
+ change it in the Makefile instead
#define PARITY
+*/
/*
diff -urN linux-2.0.34pre16/drivers/scsi/t128.c linux-2.0.34/drivers/scsi/t128.c
--- linux-2.0.34pre16/drivers/scsi/t128.c Tue Apr 9 07:25:38 1996
+++ linux-2.0.34/drivers/scsi/t128.c Sat May 30 15:22:11 1998
@@ -324,7 +324,7 @@
int len) {
register unsigned char *reg = (unsigned char *) (instance->base +
T_DATA_REG_OFFSET), *d = dst;
- register i = len;
+ register int i = len;
#if 0
@@ -368,7 +368,7 @@
int len) {
register unsigned char *reg = (unsigned char *) (instance->base +
T_DATA_REG_OFFSET), *s = src;
- register i = len;
+ register int i = len;
#if 0
for (; i; --i) {
diff -urN linux-2.0.34pre16/drivers/scsi/wd7000.c linux-2.0.34/drivers/scsi/wd7000.c
--- linux-2.0.34pre16/drivers/scsi/wd7000.c Fri May 29 23:41:40 1998
+++ linux-2.0.34/drivers/scsi/wd7000.c Sat May 30 15:35:19 1998
@@ -508,7 +508,7 @@
typedef struct icbUnsMask { /* I'm totally guessing here */
unchar op;
volatile unchar mask[14]; /* mask bits */
-#ifdef 0
+#if 0
unchar rsvd[12]; /* reserved */
#endif
volatile unchar vue; /* vendor-unique error code */
@@ -1686,7 +1686,7 @@
/*
* I also have no idea how to do a reset...
*/
-int wd7000_reset (Scsi_Cmnd *SCpnt)
+int wd7000_reset (Scsi_Cmnd *SCpnt, unsigned int flags)
{
return (SCSI_RESET_PUNT);
}
diff -urN linux-2.0.34pre16/drivers/scsi/wd7000.h linux-2.0.34/drivers/scsi/wd7000.h
--- linux-2.0.34pre16/drivers/scsi/wd7000.h Mon Aug 11 16:37:24 1997
+++ linux-2.0.34/drivers/scsi/wd7000.h Sat May 30 15:35:41 1998
@@ -20,7 +20,7 @@
int wd7000_command (Scsi_Cmnd *);
int wd7000_queuecommand (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int wd7000_abort (Scsi_Cmnd *);
-int wd7000_reset (Scsi_Cmnd *);
+int wd7000_reset (Scsi_Cmnd *, unsigned int);
int wd7000_biosparam (Disk *, kdev_t, int *);
#ifndef NULL
diff -urN linux-2.0.34pre16/fs/super.c linux-2.0.34/fs/super.c
--- linux-2.0.34pre16/fs/super.c Fri May 29 23:41:40 1998
+++ linux-2.0.34/fs/super.c Sat May 30 14:54:45 1998
@@ -47,6 +47,7 @@
extern void wait_for_keypress(void);
extern struct file_operations * get_blkfops(unsigned int major);
extern void blkdev_release (struct inode *);
+extern void rd_load_secondary(void);
extern int root_mountflags;
diff -urN linux-2.0.34pre16/include/asm-i386/string.h linux-2.0.34/include/asm-i386/string.h
--- linux-2.0.34pre16/include/asm-i386/string.h Tue Apr 8 11:47:46 1997
+++ linux-2.0.34/include/asm-i386/string.h Fri May 29 23:39:37 1998
@@ -437,7 +437,7 @@
case 0: COMMON(""); return to;
case 1: COMMON("\n\tmovsb"); return to;
case 2: COMMON("\n\tmovsw"); return to;
- case 3: COMMON("\n\tmovsw\n\tmovsb"); return to;
+ default: COMMON("\n\tmovsw\n\tmovsb"); return to;
}
#undef COMMON
}
@@ -588,7 +588,7 @@
case 0: COMMON(""); return s;
case 1: COMMON("\n\tstosb"); return s;
case 2: COMMON("\n\tstosw"); return s;
- case 3: COMMON("\n\tstosw\n\tstosb"); return s;
+ default: COMMON("\n\tstosw\n\tstosb"); return s;
}
#undef COMMON
}
diff -urN linux-2.0.34pre16/net/ipv4/rarp.c linux-2.0.34/net/ipv4/rarp.c
--- linux-2.0.34pre16/net/ipv4/rarp.c Fri May 29 23:41:41 1998
+++ linux-2.0.34/net/ipv4/rarp.c Sat May 30 15:28:49 1998
@@ -97,7 +97,7 @@
NULL
};
-static initflag = 1;
+static int initflag = 1;
/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu