Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932859AbZJNKqd (ORCPT ); Wed, 14 Oct 2009 06:46:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932817AbZJNKqc (ORCPT ); Wed, 14 Oct 2009 06:46:32 -0400 Received: from mtagate1.de.ibm.com ([195.212.17.161]:48993 "EHLO mtagate1.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932687AbZJNKqb (ORCPT ); Wed, 14 Oct 2009 06:46:31 -0400 Date: Wed, 14 Oct 2009 12:45:53 +0200 From: Martin Schwidefsky To: Kamalesh Babulal Cc: Peter.Oberparleiter@de.ibm.com, linux-next@vger.kernel.org, LKML , Stephen Rothwell , heiko.carstens@de.ibm.com, linux-s390@vger.kernel.org Subject: Re: [BUILD_FAILURE] next-20091013 s390x - build breaks SCLP VT220 terminal driver Message-ID: <20091014124553.596e7f5a@mschwide.boeblingen.de.ibm.com> In-Reply-To: <20091013162809.GA27977@linux.vnet.ibm.com> References: <20091013162312.8b93998b.sfr@canb.auug.org.au> <20091013162809.GA27977@linux.vnet.ibm.com> Organization: IBM Corporation X-Mailer: Claws Mail 3.7.3 (GTK+ 2.18.2; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2554 Lines: 87 On Tue, 13 Oct 2009 21:58:09 +0530 Kamalesh Babulal wrote: > next-20091013 randconfig build on s390x build breaks with > > drivers/s390/built-in.o:(.data+0x3354): undefined reference to `sclp_vt220_pm_event_fn' Michael pointed out a problem with my fix: suspend/resume of a vt220 console with SCLP_VT220_CONSOLE=n doesn't work any more. V2 of the patch: -- Subject: [PATCH] sclp_vt220 build fix From: Michael Holzheu Fix this build error: next-20091013 randconfig build on s390x build breaks with drivers/s390/built-in.o:(.data+0x3354): undefined reference to `sclp_vt220_pm_event_fn' Reported-by: Kamalesh Babulal Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky --- drivers/s390/char/sclp_vt220.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff -urpN linux-2.6/drivers/s390/char/sclp_vt220.c linux-2.6-patched/drivers/s390/char/sclp_vt220.c --- linux-2.6/drivers/s390/char/sclp_vt220.c 2009-09-10 00:13:59.000000000 +0200 +++ linux-2.6-patched/drivers/s390/char/sclp_vt220.c 2009-10-14 12:41:48.000000000 +0200 @@ -705,21 +705,6 @@ out_driver: } __initcall(sclp_vt220_tty_init); -#ifdef CONFIG_SCLP_VT220_CONSOLE - -static void -sclp_vt220_con_write(struct console *con, const char *buf, unsigned int count) -{ - __sclp_vt220_write((const unsigned char *) buf, count, 1, 1, 0); -} - -static struct tty_driver * -sclp_vt220_con_device(struct console *c, int *index) -{ - *index = 0; - return sclp_vt220_driver; -} - static void __sclp_vt220_flush_buffer(void) { unsigned long flags; @@ -776,6 +761,21 @@ static void sclp_vt220_pm_event_fn(struc } } +#ifdef CONFIG_SCLP_VT220_CONSOLE + +static void +sclp_vt220_con_write(struct console *con, const char *buf, unsigned int count) +{ + __sclp_vt220_write((const unsigned char *) buf, count, 1, 1, 0); +} + +static struct tty_driver * +sclp_vt220_con_device(struct console *c, int *index) +{ + *index = 0; + return sclp_vt220_driver; +} + static int sclp_vt220_notify(struct notifier_block *self, unsigned long event, void *data) -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/