diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/arch/i386/kernel/smpboot.c linux/arch/i386/kernel/smpboot.c --- /mnt/raid/1/linux-2.4.0-test10pre6/arch/i386/kernel/smpboot.c Fri Oct 27 19:11:09 2000 +++ linux/arch/i386/kernel/smpboot.c Sat Oct 28 11:38:07 2000 @@ -71,6 +71,8 @@ /* Set when the idlers are all forked */ int smp_threads_ready; +extern int skip_ioapic_setup; + /* * Setup routine for controlling SMP activation * Only in linux/arch/i386/kernel: t diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/block/cciss.c linux/drivers/block/cciss.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/block/cciss.c Sun Oct 29 14:14:27 2000 +++ linux/drivers/block/cciss.c Sat Oct 28 10:14:05 2000 @@ -113,7 +113,7 @@ static void cciss_procinit(int i); #else static int cciss_proc_get_info(char *buffer, char **start, off_t offset, - int length, int *eof, void *data) {} + int length, int *eof, void *data) { return 0;} static void cciss_procinit(int i) {} #endif /* CONFIG_PROC_FS */ diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/i2c/i2c-core.c linux/drivers/i2c/i2c-core.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/i2c/i2c-core.c Fri Oct 27 19:11:14 2000 +++ linux/drivers/i2c/i2c-core.c Sat Oct 28 13:45:20 2000 @@ -1268,13 +1268,13 @@ #ifdef CONFIG_I2C_ALGOBIT extern int i2c_algo_bit_init(void); #endif -#ifdef CONFIG_I2C_BITLP +#ifdef CONFIG_I2C_PHILIPSPAR extern int i2c_bitlp_init(void); #endif -#ifdef CONFIG_I2C_BITELV +#ifdef CONFIG_I2C_ELV extern int i2c_bitelv_init(void); #endif -#ifdef CONFIG_I2C_BITVELLE +#ifdef CONFIG_I2C_VELLEMAN extern int i2c_bitvelle_init(void); #endif #ifdef CONFIG_I2C_BITVIA @@ -1284,7 +1284,7 @@ #ifdef CONFIG_I2C_ALGOPCF extern int i2c_algo_pcf_init(void); #endif -#ifdef CONFIG_I2C_PCFISA +#ifdef CONFIG_I2C_ELEKTOR extern int i2c_pcfisa_init(void); #endif diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/ide/Makefile linux/drivers/ide/Makefile --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/ide/Makefile Sun Oct 29 14:14:29 2000 +++ linux/drivers/ide/Makefile Sat Oct 28 12:00:44 2000 @@ -31,7 +31,7 @@ ide-obj-$(CONFIG_BLK_DEV_FALCON_IDE) += falconide.o ide-obj-$(CONFIG_BLK_DEV_GAYLE) += gayle.o ide-obj-$(CONFIG_BLK_DEV_Q40IDE) += q40ide.o -ide-obj-$(CONFIG_BLK_DEV_HD) += hd.o +obj-$(CONFIG_BLK_DEV_HD) += hd.o ide-obj-$(CONFIG_BLK_DEV_HPT34X) += hpt34x.o ide-obj-$(CONFIG_BLK_DEV_HPT366) += hpt366.o ide-obj-$(CONFIG_BLK_DEV_HT6560B) += ht6560b.o diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/ide/osb4.c linux/drivers/ide/osb4.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/ide/osb4.c Sun Oct 29 14:14:29 2000 +++ linux/drivers/ide/osb4.c Sat Oct 28 10:46:18 2000 @@ -56,11 +56,12 @@ #define DISPLAY_OSB4_TIMINGS +static byte osb4_revision = 0; + #if defined(DISPLAY_OSB4_TIMINGS) && defined(CONFIG_PROC_FS) #include #include -static byte osb4_revision = 0; static struct pci_dev *bmide_dev; static int osb4_get_info(char *, char **, off_t, int, int); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/hisax/bkm_a8.c linux/drivers/isdn/hisax/bkm_a8.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/hisax/bkm_a8.c Mon Aug 21 16:49:02 2000 +++ linux/drivers/isdn/hisax/bkm_a8.c Sun Oct 29 10:46:10 2000 @@ -463,5 +463,6 @@ return (1); #else printk(KERN_ERR "HiSax: bkm_a8 only supported on PCI Systems\n"); + return (1); #endif /* CONFIG_PCI */ } diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/hisax/nj_s.c linux/drivers/isdn/hisax/nj_s.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/hisax/nj_s.c Mon Aug 21 16:49:03 2000 +++ linux/drivers/isdn/hisax/nj_s.c Sat Oct 28 11:08:09 2000 @@ -148,10 +148,10 @@ return(0); test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); +#if CONFIG_PCI for ( ;; ) { -#if CONFIG_PCI if (!pci_present()) { printk(KERN_ERR "Netjet: no PCI bus present\n"); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/hisax/nj_u.c linux/drivers/isdn/hisax/nj_u.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/hisax/nj_u.c Mon Aug 21 16:49:03 2000 +++ linux/drivers/isdn/hisax/nj_u.c Sat Oct 28 11:08:37 2000 @@ -150,10 +150,10 @@ return(0); test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); +#ifdef CONFIG_PCI for ( ;; ) { -#if CONFIG_PCI if (!pci_present()) { printk(KERN_ERR "NETspider-U: no PCI bus present\n"); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/isdn_cards.c linux/drivers/isdn/isdn_cards.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/isdn_cards.c Sun Aug 6 21:43:42 2000 +++ linux/drivers/isdn/isdn_cards.c Sat Oct 28 11:10:25 2000 @@ -44,6 +44,8 @@ extern void capidrv_init(void); #endif +extern void act2000_init(void); + void isdn_cards_init(void) { diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/sc/debug.c linux/drivers/isdn/sc/debug.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/isdn/sc/debug.c Sun Oct 29 14:14:29 2000 +++ linux/drivers/isdn/sc/debug.c Sat Oct 28 11:22:24 2000 @@ -27,8 +27,6 @@ */ #include -#define NULL 0x0 - #define REQUEST_IRQ(a,b,c,d,e) request_irq(a,b,c,d,e) #define FREE_IRQ(a,b) free_irq(a,b) @@ -61,7 +59,7 @@ *i = *j; i++; j++; } - *(++i) = NULL; + *(++i) = '\0'; return dest; } diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/md/lvm.c linux/drivers/md/lvm.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/md/lvm.c Fri Oct 27 19:11:15 2000 +++ linux/drivers/md/lvm.c Sat Oct 28 12:52:36 2000 @@ -1928,7 +1928,7 @@ { int l, le, l_new, p, size; ulong lv_status_save; - char *lv_tmp, *lv_buf; + char *lv_tmp, *lv_buf=NULL; lv_block_exception_t *lvbe = lv->lv_block_exception; vg_t *vg_ptr = vg[VG_CHR(minor)]; lv_t *lv_ptr = NULL; diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/mtd/cfi_cmdset_0002.c linux/drivers/mtd/cfi_cmdset_0002.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/mtd/cfi_cmdset_0002.c Fri Oct 27 19:11:15 2000 +++ linux/drivers/mtd/cfi_cmdset_0002.c Sat Oct 28 12:52:12 2000 @@ -437,7 +437,7 @@ adr = instr->addr - (chipnum << cfi->chipshift) * (cfi->interleave); len = instr->len; -printk("erase : 0x%lx 0x%lx 0x%x 0x%x\n", adr, len, chipnum, mtd->size); +printk("erase : 0x%lx 0x%lx 0x%x 0x%lx\n", adr, len, chipnum, mtd->size); while(len) { //printk("erase : 0x%x 0x%x 0x%x 0x%x\n", chipnum, adr, len, cfi->chipshift); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/mtd/doc1000.c linux/drivers/mtd/doc1000.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/mtd/doc1000.c Thu Jul 6 10:22:24 2000 +++ linux/drivers/mtd/doc1000.c Sat Oct 28 11:02:40 2000 @@ -294,7 +293,7 @@ static inline int byte_write (volatile u_char *addr, u_char byte) { - register u_char status; + register u_char status=0; register u_short i; for (i = 0; i < max_tries; i++) diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/mtd/docprobe.c linux/drivers/mtd/docprobe.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/mtd/docprobe.c Thu Jul 13 19:19:55 2000 +++ linux/drivers/mtd/docprobe.c Sat Oct 28 12:54:34 2000 @@ -223,11 +223,11 @@ (*initroutine)(mtd); #if defined(CONFIG_MODULES) && LINUX_VERSION_CODE >= 0x20400 if (initroutinedynamic) - put_module_symbol(initroutine); + put_module_symbol((unsigned long)initroutine); #endif return; } - printk("Cannot find driver for DiskOnChip %s at 0x%X\n", name, physadr); + printk("Cannot find driver for DiskOnChip %s at 0x%lX\n", name, physadr); } iounmap((void *)docptr); } diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/mtd/pmc551.c linux/drivers/mtd/pmc551.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/mtd/pmc551.c Fri Jul 14 21:21:19 2000 +++ linux/drivers/mtd/pmc551.c Sat Oct 28 13:05:53 2000 @@ -347,7 +347,7 @@ #ifdef CONFIG_MTD_PMC551_BUGFIX u32 dram_data; #endif - u32 size, dcmd; + u32 size=0, dcmd; u16 cmd, i; /* Sanity Check */ diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/Config.in linux/drivers/net/Config.in --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/Config.in Sun Oct 29 14:14:29 2000 +++ linux/drivers/net/Config.in Sat Oct 28 10:59:16 2000 @@ -269,7 +269,7 @@ fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Red Creek Hardware VPN (EXPERIMENTAL)' CONFIG_RCPCI + dep_tristate 'Red Creek Hardware VPN (EXPERIMENTAL)' CONFIG_RCPCI $CONFIG_PCI tristate 'Traffic Shaper (EXPERIMENTAL)' CONFIG_SHAPER fi diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/appletalk/Config.in linux/drivers/net/appletalk/Config.in --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/appletalk/Config.in Sat Mar 11 20:27:14 2000 +++ linux/drivers/net/appletalk/Config.in Sat Oct 28 12:06:56 2000 @@ -7,13 +7,13 @@ comment 'Appletalk devices' bool 'Appletalk interfaces support' CONFIG_APPLETALK if [ "$CONFIG_APPLETALK" != "n" ]; then - dep_tristate ' Apple/Farallon LocalTalk PC support' CONFIG_LTPC $CONFIG_APPLETALK - dep_tristate ' COPS LocalTalk PC support' CONFIG_COPS $CONFIG_APPLETALK + dep_tristate ' Apple/Farallon LocalTalk PC support' CONFIG_LTPC $CONFIG_ATALK + dep_tristate ' COPS LocalTalk PC support' CONFIG_COPS $CONFIG_ATALK if [ "$CONFIG_COPS" != "n" ]; then bool ' Dayna firmware support' CONFIG_COPS_DAYNA bool ' Tangent firmware support' CONFIG_COPS_TANGENT fi - dep_tristate ' Appletalk-IP driver support' CONFIG_IPDDP $CONFIG_APPLETALK + dep_tristate ' Appletalk-IP driver support' CONFIG_IPDDP $CONFIG_ATALK if [ "$CONFIG_IPDDP" != "n" ]; then bool ' IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP bool ' Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/arcnet/arcnet.c linux/drivers/net/arcnet/arcnet.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/arcnet/arcnet.c Fri Oct 27 19:11:16 2000 +++ linux/drivers/net/arcnet/arcnet.c Sat Oct 28 12:17:48 2000 @@ -528,7 +528,7 @@ struct arcnet_local *lp = (struct arcnet_local *) dev->priv; int status = 0; /* default is failure */ unsigned short type; - uint8_t daddr; + uint8_t daddr = 0; if (skb->nh.raw - skb->mac.raw != 2) { BUGMSG(D_NORMAL, diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/rclanmtl.c linux/drivers/net/rclanmtl.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/rclanmtl.c Sun Oct 29 14:14:30 2000 +++ linux/drivers/net/rclanmtl.c Sat Oct 28 10:16:17 2000 @@ -1579,7 +1579,7 @@ pPab->pCallbackFunc = CallbackFunction; - pMsg = (PU32)(pPab->pPci45LinBaseAddr + off); + pMsg = (unsigned long*)(pPab->pPci45LinBaseAddr + off); /* setup message */ pMsg[0] = FOUR_WORD_MSG_SIZE | SGL_OFFSET_0; diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/wan/comx.c linux/drivers/net/wan/comx.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/net/wan/comx.c Fri Oct 27 19:11:17 2000 +++ linux/drivers/net/wan/comx.c Sat Oct 28 12:11:59 2000 @@ -852,7 +852,7 @@ cleanup_filename_hardware: remove_proc_entry(FILENAME_HARDWARE, new_dir); cleanup_new_dir: - remove_proc_entry(dentry->d_name.name, &comx_root_dir); + remove_proc_entry(dentry->d_name.name, comx_root_dir); cleanup_dev: kfree(dev); return ret; diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/cs4281.c linux/drivers/sound/cs4281.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/cs4281.c Fri Oct 27 19:11:20 2000 +++ linux/drivers/sound/cs4281.c Sat Oct 28 13:25:06 2000 @@ -336,7 +336,7 @@ //**************************************************************************** static int cs4281_write_ac97(struct cs4281_state *card, u32 offset, u32 value) { - u32 count, status; + u32 count, status=0; CS_DBGOUT(CS_FUNCTION, 2, printk(KERN_INFO "cs4281: cs_4281_write_ac97()+ \n") ); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/msnd_pinnacle.c linux/drivers/sound/msnd_pinnacle.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/msnd_pinnacle.c Sun Oct 29 14:14:32 2000 +++ linux/drivers/sound/msnd_pinnacle.c Sat Oct 28 12:16:27 2000 @@ -1403,7 +1403,6 @@ return 0; } -#ifdef MODULE static void unload_multisound(void) { release_region(dev.io, dev.numio); @@ -1412,7 +1411,6 @@ unregister_sound_dsp(dev.dsp_minor); msnd_unregister(&dev); } -#endif #ifndef MSND_CLASSIC diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/sb_common.c linux/drivers/sound/sb_common.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/sb_common.c Fri Oct 27 19:11:20 2000 +++ linux/drivers/sound/sb_common.c Sat Oct 28 16:03:51 2000 @@ -1226,7 +1226,7 @@ if (!ess_midi_init(devc, hw_config)) return 0; hw_config->name = "ESS1xxx MPU"; - devc->midi_irq_cookie = -1; + devc->midi_irq_cookie = (void*)-1; if (!probe_mpu401(hw_config)) return 0; attach_mpu401(hw_config, owner); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/trident.c linux/drivers/sound/trident.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/trident.c Sun Oct 29 14:14:32 2000 +++ linux/drivers/sound/trident.c Sat Oct 28 11:00:55 2000 @@ -1459,8 +1459,8 @@ struct dmabuf *dmabuf_temp; ssize_t ret; unsigned long flags; - unsigned swptr, sample_s; - int cnt, i, other_dma_nums, loop, cnt_for_multi_channel; + unsigned swptr, sample_s=0; + int cnt, i, other_dma_nums=0, loop, cnt_for_multi_channel; #ifdef DEBUG printk("trident: trident_write called, count = %d\n", count); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/via82cxxx_audio.c linux/drivers/sound/via82cxxx_audio.c --- /mnt/raid/1/linux-2.4.0-test10pre6/drivers/sound/via82cxxx_audio.c Sun Oct 29 14:14:32 2000 +++ linux/drivers/sound/via82cxxx_audio.c Sat Oct 28 10:44:27 2000 @@ -1696,7 +1696,7 @@ return NOPAGE_OOM; /* Nothing allocated */ } - pgoff = vma->vm_pgoff + (address - vma->vm_start) >> PAGE_SHIFT; + pgoff = vma->vm_pgoff + ((address - vma->vm_start) >> PAGE_SHIFT); rd = card->ch_in.is_mapped; wr = card->ch_out.is_mapped; diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/net/atm/pvc.c linux/net/atm/pvc.c --- /mnt/raid/1/linux-2.4.0-test10pre6/net/atm/pvc.c Sun Oct 29 14:14:35 2000 +++ linux/net/atm/pvc.c Sat Oct 28 11:25:08 2000 @@ -130,7 +130,7 @@ error = sock_register(&pvc_family_ops); if (error < 0) { printk(KERN_ERR "ATMPVC: can't register (%d)",error); - return; + return 1; } #ifdef CONFIG_ATM_CLIP atm_clip_init(); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/net/irda/irda_device.c linux/net/irda/irda_device.c --- /mnt/raid/1/linux-2.4.0-test10pre6/net/irda/irda_device.c Tue Mar 21 20:17:28 2000 +++ linux/net/irda/irda_device.c Sat Oct 28 14:36:56 2000 @@ -56,6 +56,7 @@ #include extern int irtty_init(void); +extern int toshoboe_init(void); extern int nsc_ircc_init(void); extern int ircc_init(void); extern int w83977af_init(void); @@ -63,6 +64,7 @@ extern int tekram_init(void); extern int actisys_init(void); extern int girbil_init(void); +extern int litelink_init(void); static void __irda_task_delete(struct irda_task *task); diff -ur /mnt/raid/1/linux-2.4.0-test10pre6/net/irda/irttp.c linux/net/irda/irttp.c --- /mnt/raid/1/linux-2.4.0-test10pre6/net/irda/irttp.c Tue Mar 21 20:17:28 2000 +++ linux/net/irda/irttp.c Sat Oct 28 12:53:50 2000 @@ -1534,9 +1534,9 @@ self->remote_credit); len += sprintf(buf+len, "send credit: %d\n", self->send_credit); - len += sprintf(buf+len, " tx packets: %d, ", + len += sprintf(buf+len, " tx packets: %ld, ", self->stats.tx_packets); - len += sprintf(buf+len, "rx packets: %d, ", + len += sprintf(buf+len, "rx packets: %ld, ", self->stats.rx_packets); len += sprintf(buf+len, "tx_queue len: %d ", skb_queue_len(&self->tx_queue));