linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>,
	linux-next@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>,
	jens.axboe@oracle.com, Kay Sievers <kay.sievers@vrfy.org>
Subject: Re: [PATCH -next] block: genhd errors when CONFIG_PROC_FS=n
Date: Tue, 27 May 2008 22:26:03 -0700	[thread overview]
Message-ID: <20080528052603.GB8736@kroah.com> (raw)
In-Reply-To: <20080527222036.1141e43a.akpm@linux-foundation.org>

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

  reply	other threads:[~2008-05-28  5:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-23 16:44 [PATCH -next] block: genhd errors when CONFIG_PROC_FS=n Randy Dunlap
2008-05-28  5:20 ` Andrew Morton
2008-05-28  5:26   ` Greg KH [this message]
2008-05-28  6:01   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080528052603.GB8736@kroah.com \
    --to=greg@kroah.com \
    --cc=akpm@linux-foundation.org \
    --cc=jens.axboe@oracle.com \
    --cc=kay.sievers@vrfy.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=randy.dunlap@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).