Here are some simple fixes that I made to get Linux closer to
compiling under -Werrror. I made a number of changes and then wimped
out, removing -Werror from the makefile for the moment. These are
some of the simplest changes, that I am submitting as a group so that
you can integrate them quickly without having to think about them too
much. I will have more patches later.
Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 104
adam@yggdrasil.com \ / San Jose, California 95129-1034
+1 408 261-6630 | g g d r a s i l United States of America
fax +1 408 261-6631 "Free Software For The Rest Of Us."
--- linux-2.4.0-test3-pre2/drivers/block/lvm-snap.c Wed May 24 18:38:26 2000
+++ linux/drivers/block/lvm-snap.c Sat Jul 1 02:59:45 2000
@@ -29,7 +29,7 @@
#include <linux/lvm.h>
-static char *lvm_snap_version = "LVM 0.8final (15/02/2000)\n";
+/* LVM 0.8final (15/02/2000) */
extern const char *const lvm_name;
extern int lvm_blocksizes[];
--- linux-2.4.0-test3-pre2/drivers/block/lvm.c Wed May 24 18:38:26 2000
+++ linux/drivers/block/lvm.c Sat Jul 1 02:59:45 2000
@@ -165,6 +165,7 @@
#include <linux/kerneld.h>
#endif
+#define LOCAL_END_REQUEST
#include <linux/blk.h>
#include <linux/blkpg.h>
--- linux-2.4.0-test3-pre2/drivers/char/generic_serial.c Tue Jun 20 07:32:13 2000
+++ linux/drivers/char/generic_serial.c Sat Jul 1 02:59:56 2000
@@ -56,7 +56,7 @@
MODULE_PARM(gs_debug, "i");
#endif
-#ifdef DEBUG
+#if 0 /*#ifdef DEBUG*/
static void my_hd (unsigned char *addr, int len)
{
int i, j, ch;
--- linux-2.4.0-test3-pre2/drivers/net/smc9194.c Mon Jun 19 13:42:39 2000
+++ linux/drivers/net/smc9194.c Sat Jul 1 03:01:11 2000
@@ -1591,9 +1591,8 @@
#ifdef MODULE
-static char devicename[9] = { 0, };
static struct net_device devSMC9194 = {
- devicename, /* device name is inserted by linux/drivers/net/net_init.c */
+ "", /* device name is inserted by linux/drivers/net/net_init.c */
0, 0, 0, 0,
0, 0, /* I/O address, IRQ */
0, 0, 0, NULL, smc_init };
--- linux-2.4.0-test3-pre2/fs/affs/inode.c Wed Jun 21 07:25:16 2000
+++ linux/fs/affs/inode.c Sat Jul 1 03:02:52 2000
@@ -191,7 +191,7 @@
}
void
-affs_write_inode(struct inode *inode)
+affs_write_inode(struct inode *inode, int wait)
{
struct buffer_head *bh;
struct file_end *file_end;
--- linux-2.4.0-test3-pre2/fs/super.c Sat Jul 1 03:08:28 2000
+++ linux/fs/super.c Sat Jul 1 03:02:52 2000
@@ -1650,7 +1650,6 @@
int __init change_root(kdev_t new_root_dev,const char *put_old)
{
- kdev_t old_root_dev = ROOT_DEV;
struct vfsmount *old_rootmnt;
struct nameidata devfs_nd, nd;
int error = 0;
@@ -1660,8 +1659,6 @@
if (path_init("/dev", LOOKUP_FOLLOW|LOOKUP_POSITIVE, &devfs_nd))
error = path_walk("/dev", &devfs_nd);
if (!error) {
- struct super_block *sb = devfs_nd.dentry->d_inode->i_sb;
-
if (devfs_nd.mnt->mnt_sb->s_magic == DEVFS_SUPER_MAGIC &&
devfs_nd.dentry == devfs_nd.mnt->mnt_root) {
dput(devfs_nd.dentry);
@@ -1695,7 +1692,7 @@
printk("okay\n");
return 0;
}
- printk(KERN_ERR "error %ld\n",blivet);
+ printk(KERN_ERR "error %d\n",blivet);
return error;
}
/* FIXME: we should hold i_zombie on nd.dentry */
--- linux-2.4.0-test3-pre2/init/main.c Fri Jun 23 21:04:36 2000
+++ linux/init/main.c Sat Jul 1 03:04:40 2000
@@ -100,6 +100,7 @@
extern void free_initmem(void);
extern void filesystem_setup(void);
+extern void md_run_setup(void);
extern void ecard_init(void);
-
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/
This archive was generated by hypermail 2b29 : Fri Jul 07 2000 - 21:00:09 EST