Re: [BUILD_FAILURE] next-20091013 s390x - build breaks SCLP VT220 terminal driver

[Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>]

* Martin Schwidefsky <schwidefsky@de.ibm.com> [2009-10-14 12:45:53]:

> 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:
> 

Thanks, the patch fixes the build failure.

> --
> 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'
> 
  Tested-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> 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.
> 
			
			Kamalesh