public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Martin Schwidefsky <schwidefsky@de•ibm.com>
To: Kamalesh Babulal <kamalesh@linux•vnet.ibm.com>
Cc: Peter.Oberparleiter@de•ibm.com, linux-next@vger•kernel.org,
	LKML <linux-kernel@vger•kernel.org>,
	Stephen Rothwell <sfr@canb•auug.org.au>,
	heiko.carstens@de•ibm.com, linux-s390@vger•kernel.org
Subject: Re: [BUILD_FAILURE] next-20091013 s390x - build breaks SCLP VT220 terminal driver
Date: Wed, 14 Oct 2009 12:45:53 +0200	[thread overview]
Message-ID: <20091014124553.596e7f5a@mschwide.boeblingen.de.ibm.com> (raw)
In-Reply-To: <20091013162809.GA27977@linux.vnet.ibm.com>

On Tue, 13 Oct 2009 21:58:09 +0530
Kamalesh Babulal <kamalesh@linux•vnet.ibm.com> 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 <michael.holzheu@linux•vnet.ibm.com>

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 <kamalesh@linux•vnet.ibm.com>
Signed-off-by: Michael Holzheu <michael.holzheu@linux•vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de•ibm.com>
---

 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.

  parent reply	other threads:[~2009-10-14 10:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-13  5:23 linux-next: Tree for October 13 Stephen Rothwell
2009-10-13 10:06 ` [BUILD-FAILURE] next-20091013 - s390x build breaks at mm/fault with !CONFIG_S390_EXEC_PROTECT Kamalesh Babulal
2009-10-13 10:33   ` Martin Schwidefsky
2009-10-13 10:57     ` Kamalesh Babulal
2009-10-13 16:28 ` [BUILD_FAILURE] next-20091013 s390x - build breaks SCLP VT220 terminal driver Kamalesh Babulal
2009-10-14  9:02   ` Martin Schwidefsky
2009-10-14 10:45   ` Martin Schwidefsky [this message]
2009-10-14 16:02     ` Kamalesh Babulal
2009-10-13 17:00 ` [PATCH] wan: pci200syn needs capability.h Randy Dunlap
2009-10-13 17:19   ` Krzysztof Halasa
2009-10-13 17:01 ` [PATCH] whci: fix type and format warnings Randy Dunlap
     [not found]   ` <20091013100128.0f06d67c.randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2009-10-13 17:51     ` David Vrabel
2009-10-13 18:07       ` Randy Dunlap

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=20091014124553.596e7f5a@mschwide.boeblingen.de.ibm.com \
    --to=schwidefsky@de$(echo .)ibm.com \
    --cc=Peter.Oberparleiter@de$(echo .)ibm.com \
    --cc=heiko.carstens@de$(echo .)ibm.com \
    --cc=kamalesh@linux$(echo .)vnet.ibm.com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linux-s390@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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