Messages in this thread Patches in this message | | | Date | Sat, 5 Sep 98 23:42 BST | From | (Alan Cox) | Subject | PATCH: assorted small fixes for 2.1.120 |
| |
A little collection of small warning/error fixes.
Cyclades warning
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/drivers/char/cyclades.c linux/drivers/char/cyclades.c --- linux.vanilla/drivers/char/cyclades.c Sat Sep 5 16:17:22 1998 +++ linux/drivers/char/cyclades.c Sat Sep 5 21:50:38 1998 @@ -4974,7 +4974,7 @@ if (info->count) size = sprintf(buf+len, - "%3d %8lu %10lu %8lu %10lu %8lu %9lu %6d\n", + "%3d %8lu %10lu %8lu %10lu %8lu %9lu %6ld\n", info->line, JIFFIES_DIFF(info->idle_stats.in_use, cur_jifs) / HZ, info->idle_stats.xmit_bytes,
PC110 pad doesnt need busmouse.h
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/drivers/char/pc110pad.c linux/drivers/char/pc110pad.c --- linux.vanilla/drivers/char/pc110pad.c Wed Aug 26 17:01:03 1998 +++ linux/drivers/char/pc110pad.c Tue Sep 1 16:16:05 1998 @@ -18,7 +18,6 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/busmouse.h> #include <linux/signal.h> #include <linux/errno.h> #include <linux/mm.h>
SDLA casting warning
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/drivers/net/sdladrv.c linux/drivers/net/sdladrv.c --- linux.vanilla/drivers/net/sdladrv.c Sat Sep 5 16:17:23 1998 +++ linux/drivers/net/sdladrv.c Sat Sep 5 21:52:03 1998 @@ -437,7 +437,7 @@ return -EINVAL; } printk(KERN_INFO "%s: dual-port memory window is set at 0x%lX.\n", - modname, virt_to_phys(hw->dpmbase)) + modname, virt_to_phys((void *)hw->dpmbase)) ; printk(KERN_INFO "%s: found %luK bytes of on-board memory.\n", modname, hw->memory / 1024) Make STRIP compile again
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/drivers/net/strip.c linux/drivers/net/strip.c --- linux.vanilla/drivers/net/strip.c Tue Feb 10 20:56:45 1998 +++ linux/drivers/net/strip.c Sat Sep 5 18:10:08 1998 @@ -2430,7 +2430,6 @@ dev->tx_queue_len = 30; /* Drop after 30 frames queued */ dev->flags = 0; - dev->metric = 0; dev->mtu = DEFAULT_STRIP_MTU; dev->type = ARPHRD_METRICOM; /* dtang */ dev->hard_header_len = sizeof(STRIP_Header);
NCR5380/T128 fixes
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/drivers/scsi/NCR5380.c linux/drivers/scsi/NCR5380.c --- linux.vanilla/drivers/scsi/NCR5380.c Sat Sep 5 16:17:23 1998 +++ linux/drivers/scsi/NCR5380.c Sat Sep 5 21:57:43 1998 @@ -1628,14 +1628,18 @@ NCR5380_local_declare(); struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; unsigned char tmp[3], phase; - unsigned char *data, value; + unsigned char *data; int len; unsigned long timeout; unsigned long flags; +#ifdef USLEEP + unsigned char value; +#endif - NCR5380_setup(instance); + NCR5380_setup(instance); #ifdef USLEEP + if (hostdata->selecting) { goto part2; /* RvC: sorry prof. Dijkstra, but it keeps the @@ -2250,8 +2254,8 @@ register unsigned char p = *phase; register unsigned char *d = *data; unsigned char tmp; - int foo; unsigned long flags; + int foo; #if defined(REAL_DMA_POLL) int cnt, toPIO; unsigned char saved_data = 0, overrun = 0, residue; diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/drivers/scsi/t128.c linux/drivers/scsi/t128.c --- linux.vanilla/drivers/scsi/t128.c Sat Apr 11 19:13:25 1998 +++ linux/drivers/scsi/t128.c Sat Sep 5 22:01:28 1998 @@ -240,7 +240,7 @@ break; instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata)); - instance->base = base; + instance->base = phys_to_virt((unsigned int)base); NCR5380_init(instance, 0);
Make inode_init an initfunc
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/fs/inode.c linux/fs/inode.c --- linux.vanilla/fs/inode.c Sat Sep 5 16:17:25 1998 +++ linux/fs/inode.c Sat Sep 5 17:07:39 1998 @@ -8,6 +8,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/dcache.h> +#include <linux/init.h> #include <linux/quotaops.h> /* @@ -734,11 +735,11 @@ /* * Initialize the hash tables and default - * value for max inodes.. + * value for max inodes */ #define MAX_INODE (8192) -void inode_init(void) +__initfunc(void inode_init(void)) { int i, max; struct list_head *head = inode_hashtable;
QNX wont compile
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/fs/qnx4/inode.c linux/fs/qnx4/inode.c --- linux.vanilla/fs/qnx4/inode.c Sat Sep 5 16:17:25 1998 +++ linux/fs/qnx4/inode.c Sat Sep 5 18:22:37 1998 @@ -134,11 +134,12 @@ #else NULL, #endif - qnx4_put_inode, #ifdef CONFIG_QNX4FS_RW + qnx4_put_inode, qnx4_delete_inode, NULL, /* notify_change */ #else + NULL, /* put_inode */ NULL, /* delete_inode */ NULL, /* notify_change */ #endif
Add new soundcore function to includes
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/include/linux/sound.h linux/include/linux/sound.h --- linux.vanilla/include/linux/sound.h Mon Jul 6 16:18:23 1998 +++ linux/include/linux/sound.h Tue Sep 1 16:11:07 1998 @@ -6,8 +6,10 @@ extern int register_sound_mixer(struct file_operations *fops); extern int register_sound_midi(struct file_operations *fops); extern int register_sound_dsp(struct file_operations *fops); +extern int register_sound_synth(struct file_operations *fops); extern void unregister_sound_special(int unit); extern void unregister_sound_mixer(int unit); extern void unregister_sound_midi(int unit); extern void unregister_sound_dsp(int unit); +extern void unregister_sound_synth(int unit); Unfixed flush() entry
diff -u --new-file --recursive --exclude-from ../exclude linux.vanilla/drivers/block/ide-tape.c linux/drivers/block/ide-tape.c --- linux.vanilla/drivers/block/ide-tape.c Wed May 6 22:42:53 1998 +++ linux/drivers/block/ide-tape.c Sat Sep 5 21:51:30 1998 @@ -3708,6 +3708,7 @@ idetape_chrdev_ioctl, /* ioctl */ NULL, /* mmap */ idetape_chrdev_open, /* open */ + NULL, /* flush */ idetape_chrdev_release, /* release */ NULL, /* fsync */ NULL, /* fasync */ - 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/faq.html
| |