lkml.org 
[lkml]   [2008]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH -next] block: genhd errors when CONFIG_PROC_FS=n
On Tue, May 27, 2008 at 10:20:36PM -0700, Andrew Morton wrote:
> On Fri, 23 May 2008 09:44:11 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > block/genhd.c has build errors when CONFIG_PROC_FS=n, so omit some of
> > its functions in that case.
> >
> > /local/linsrc/linux-next-20080523/block/genhd.c: In function 'diskstats_start':
> > /local/linsrc/linux-next-20080523/block/genhd.c:555: error: 'find_start' undeclared (first use in this function)
> > /local/linsrc/linux-next-20080523/block/genhd.c:555: error: (Each undeclared identifier is reported only once
> > /local/linsrc/linux-next-20080523/block/genhd.c:555: error: for each function it appears in.)
> > make[2]: *** [block/genhd.o] Error 1
> >
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > ---
> > block/genhd.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > --- linux-next-20080523.orig/block/genhd.c
> > +++ linux-next-20080523/block/genhd.c
> > @@ -539,6 +539,7 @@ static struct device_type disk_type = {
> > .release = disk_release,
> > };
> >
> > +#ifdef CONFIG_PROC_FS
> > /*
> > * aggregate disk stat collector. Uses the same stats that the sysfs
> > * entries do, above, but makes them available through one seq_file.
> > @@ -644,6 +645,7 @@ const struct seq_operations diskstats_op
> > .stop = diskstats_stop,
> > .show = diskstats_show
> > };
> > +#endif /* CONFIG_PROC_FS */
> >
> > static void media_change_notify_thread(struct work_struct *work)
> > {
>
> This is a fix against
>
> commit ce8568d9535b4756ea304a97ea803314ce895d3c
> Author: Greg Kroah-Hartman <gregkh@suse.de>
> Date: Thu May 22 17:21:08 2008 -0400
>
> block: make proc files seq_start use the class_find_device()
>
> Use the proper class iterator function instead of mucking around in the
> internals of the class structures.
>
> Cc: Kay Sievers <kay.sievers@vrfy.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Yeah, sorry, missed that first time around, just added it to my tree
about an hour ago and sent out a response to Randy about it :)

thanks,

greg k-h


\
 
 \ /
  Last update: 2008-05-28 07:31    [W:0.485 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site