Re: [patch] 2.6.9-rc4-mm1: USB compile error with PROC_FS=n
From: Greg KH
Date: Tue Oct 12 2004 - 11:40:19 EST
On Tue, Oct 12, 2004 at 09:34:45AM -0700, Greg KH wrote:
> > The fix is simple:
> >
> >
> > Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
> >
> > --- linux-2.6.9-rc4-mm1-full/drivers/usb/core/inode.c.old 2004-10-12 16:20:54.000000000 +0200
> > +++ linux-2.6.9-rc4-mm1-full/drivers/usb/core/inode.c 2004-10-12 16:23:53.000000000 +0200
> > @@ -746,8 +746,10 @@
> > return retval;
> > }
> >
> > +#ifdef CONFIG_PROC_FS
> > /* create mount point for usbfs */
> > usbdir = proc_mkdir("usb", proc_bus);
> > +#endif
>
> No, the proper fix is to make the proc_fs.h header file give an empty
> definition for proc_bus, so we don't have to have unneeded #ifdefs all
> over the place.
Something like this patch. I'll add this to my trees.
thanks,
greg k-h
===== proc_fs.h 1.25 vs edited =====
--- 1.25/include/linux/proc_fs.h 2004-09-29 20:39:10 -07:00
+++ edited/proc_fs.h 2004-10-12 09:36:00 -07:00
@@ -193,6 +193,7 @@
#define proc_root_driver NULL
#define proc_net NULL
+#define proc_bus NULL
#define proc_net_fops_create(name, mode, fops) ({ (void)(mode), NULL; })
#define proc_net_create(name, mode, info) ({ (void)(mode), NULL; })
-
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/