From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: [PATCH] linux-next: Tree for May 29 - build failure s390x -typo in ccw_timeout_log() Date: Thu, 29 May 2008 12:06:06 -0700 Message-ID: <20080529190606.GE22414@kroah.com> References: <20080529182556.2994310a.sfr@canb.auug.org.au> <20080529182824.GA11679@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from pentafluge.infradead.org ([213.146.154.40]:35012 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754212AbYE2TTn (ORCPT ); Thu, 29 May 2008 15:19:43 -0400 Content-Disposition: inline In-Reply-To: <20080529182824.GA11679@linux.vnet.ibm.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Kamalesh Babulal Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , linux390@de.ibm.com, apw@shadowen.org On Thu, May 29, 2008 at 11:58:24PM +0530, Kamalesh Babulal wrote: > Hi Stephen, > > The next-20080529 kernel build fails on the s390x, with the error > > drivers/s390/cio/device_fsm.c: In function `ccw_timeout_log': > drivers/s390/cio/device_fsm.c:55: error: syntax error before ';' token > drivers/s390/cio/device_fsm.c:56: error: syntax error before ';' token > make[2]: *** [drivers/s390/cio/device_fsm.o] Error 1 > make[1]: *** [drivers/s390/cio] Error 2 > make: *** [drivers/s390] Error 2 > > Signed-off-by: Kamalesh Babulal > -- > --- linux-2.6.26-rc4/drivers/s390/cio/device_fsm.c 2008-05-29 23:24:32.000000000 +0530 > +++ linux-2.6.26-rc4/drivers/s390/cio/~device_fsm.c 2008-05-29 23:29:42.000000000 +0530 > @@ -52,8 +52,8 @@ static void ccw_timeout_log(struct ccw_d > printk(KERN_WARNING "cio: orb:\n"); > print_hex_dump(KERN_WARNING, "cio: ", DUMP_PREFIX_NONE, 16, 1, > orb, sizeof(*orb), 0); > - printk(KERN_WARNING "cio: ccw device bus id: %s\n", dev_name(&cdev->dev); > - printk(KERN_WARNING "cio: subchannel bus id: %s\n", dev_name(&sch->dev); > + printk(KERN_WARNING "cio: ccw device bus id: %s\n", dev_name(&cdev->dev)); > + printk(KERN_WARNING "cio: subchannel bus id: %s\n", dev_name(&sch->dev)); > printk(KERN_WARNING "cio: subchannel lpm: %02x, opm: %02x, " > "vpm: %02x\n", sch->lpm, sch->opm, sch->vpm); Already fixed in my tree, sorry about this. greg k-h