From: Thomas Gleixner <tglx@linutronix.de>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the final tree (tty tree related)
Date: Fri, 17 Dec 2010 11:16:17 +0100 (CET) [thread overview]
Message-ID: <alpine.LFD.2.00.1012171107310.12146@localhost6.localdomain6> (raw)
In-Reply-To: <20101217070431.GA25192@kroah.com>
On Thu, 16 Dec 2010, Greg KH wrote:
> On Fri, Dec 17, 2010 at 05:11:20PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/serial/apbuart.c:596: error: conflicting types for 'grlib_apbuart_configure'
> > drivers/serial/apbuart.c:523: note: previous declaration of 'grlib_apbuart_configure' was here
> >
> > Caused by commit 35c64e5d13c3d7d8c4ad061ad5e20498b9160c24 ("drivers:
> > serial: apbuart: Handle OF failures gracefully"). This build has
> > CONFIG_SERIAL_GRLIB_GAISLER_APBUART_CONSOLE set ...
> >
> > I have reverted this commit for today.
>
> Ugh. Thomas, care to send me a patch?
Sorry, I missed the console part. Patch below.
Thanks,
tglx
---
Subject: drivers: serial: apbuart: Fixup apbuart_console_init()
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 17 Dec 2010 11:09:49 +0100
commit 35c64e5d (drivers: serial: apbuart: Handle OF failures
gracefully) missed that the modified grlib_apbuart_configure()
function is called from apbuart_console_init() as well.
Fix the fallout.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/serial/apbuart.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: linux-2.6-tip/drivers/serial/apbuart.c
===================================================================
--- linux-2.6-tip.orig/drivers/serial/apbuart.c
+++ linux-2.6-tip/drivers/serial/apbuart.c
@@ -520,11 +520,12 @@ static struct console grlib_apbuart_cons
};
-static void grlib_apbuart_configure(void);
+static int grlib_apbuart_configure(void);
static int __init apbuart_console_init(void)
{
- grlib_apbuart_configure();
+ if (grlib_apbuart_configure())
+ return -ENODEV;
register_console(&grlib_apbuart_console);
return 0;
}
next prev parent reply other threads:[~2010-12-17 10:16 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-17 6:11 linux-next: build failure after merge of the final tree (tty tree related) Stephen Rothwell
2010-12-17 7:04 ` Greg KH
2010-12-17 10:16 ` Thomas Gleixner [this message]
2011-01-06 3:27 ` Stephen Rothwell
2011-01-06 18:45 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2013-10-28 14:33 Stephen Rothwell
2013-10-28 14:49 ` Michal Simek
2013-10-28 16:05 ` Sören Brinkmann
2013-10-28 16:33 ` Greg KH
2013-10-29 7:04 ` Stephen Rothwell
2013-09-27 8:21 Stephen Rothwell
2013-09-28 1:04 ` Greg KH
2013-04-02 7:57 Stephen Rothwell
2012-11-26 13:49 Stephen Rothwell
2012-11-26 14:35 ` Steven Rostedt
2012-11-26 23:05 ` Stephen Rothwell
2012-12-13 23:32 ` Stephen Rothwell
2012-12-13 23:38 ` Greg KH
2012-12-14 0:11 ` Steven Rostedt
2012-09-24 14:36 Stephen Rothwell
2012-09-25 22:41 ` Greg KH
2012-07-20 5:02 Stephen Rothwell
2012-07-25 22:47 ` Greg KH
2012-07-26 0:23 ` Alan Cox
2012-07-25 22:52 ` Stephen Rothwell
2011-08-25 6:18 Stephen Rothwell
2011-08-25 14:08 ` Greg KH
2011-08-25 14:28 ` Timur Tabi
2011-08-25 15:22 ` Timur Tabi
2011-08-25 15:51 ` Stephen Rothwell
2011-08-25 16:09 ` Arnaud Lacombe
2011-08-26 0:39 ` Stephen Rothwell
2011-08-26 15:47 ` Arnaud Lacombe
2011-09-11 4:23 ` Stephen Rothwell
2011-09-11 9:05 ` Geert Uytterhoeven
2010-11-12 1:57 Stephen Rothwell
2010-11-12 10:44 ` Alan Cox
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=alpine.LFD.2.00.1012171107310.12146@localhost6.localdomain6 \
--to=tglx@linutronix.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).