[PATCH] Re: oops with bk kernel as of 2003-05-25T13:00:00-07

[viro (viro@parcelfarce.linux.theplanet.co.uk)]

On Sun, May 25, 2003 at 10:30:40PM +0100, viro@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx wrote:

> Guess which one wins...  What a mess...  How about the following (untested,
> but AFAICS should work)

[snip]

or, to make it compile, the following:

diff -urN linux/fs/char_dev.c linux2/fs/char_dev.c
--- linux/fs/char_dev.c	Sun May 25 08:01:46 2003
+++ linux2/fs/char_dev.c	Sun May 25 17:26:04 2003
@@ -457,11 +457,9 @@
 	return NULL;
 }
 
-static int __init chrdev_init(void)
+void __init chrdev_init(void)
 {
 	subsystem_register(&cdev_subsys);
 	kset_register(&kset_dynamic);
 	cdev_map = kobj_map_init(base_probe, &cdev_subsys);
-	return 0;
 }
-subsys_initcall(chrdev_init);
diff -urN linux/fs/dcache.c linux2/fs/dcache.c
--- linux/fs/dcache.c	Sat May 24 18:49:58 2003
+++ linux2/fs/dcache.c	Sun May 25 17:25:40 2003
@@ -1606,6 +1606,7 @@
 EXPORT_SYMBOL(d_genocide);
 
 extern void bdev_cache_init(void);
+extern void chrdev_init(void);
 
 void __init vfs_caches_init(unsigned long mempages)
 {
@@ -1626,4 +1627,5 @@
 	files_init(mempages); 
 	mnt_init(mempages);
 	bdev_cache_init();
+	chrdev_init();
 }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/