Patchwork linux-next: ttydev tree build failure

login
register
mail settings
Submitter Stephen Rothwell
Date Oct. 23, 2008, 6:29 a.m.
Message ID <20081023172938.0460b191.sfr@canb.auug.org.au>
Download mbox | patch
Permalink /patch/5424/
State Not Applicable, archived
Headers show

Comments

Stephen Rothwell - Oct. 23, 2008, 6:29 a.m.
Hi Alan,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/char/hvc_console.c: In function 'hvc_set_winsz':
drivers/char/hvc_console.c:532: warning: passing argument 2 of 'tty_do_resize' from incompatible pointer type
drivers/char/hvc_console.c:532: error: too many arguments to function 'tty_do_resize'

Caused by commit eb6ab2d361a49470ca9785c70482772c19e49bec
("pty-simplify-resize") from the ttydev tree interacting with commit
febde3711992a64ea83a47a719f68a90c4b0927a ("hvc_console: Add support for
tty window resizing").

The former added another call to the function that the latter changed.

I applied the following patch.
Alan Cox - Oct. 23, 2008, 7:34 a.m.
On Thu, 23 Oct 2008 17:29:38 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/char/hvc_console.c: In function 'hvc_set_winsz':
> drivers/char/hvc_console.c:532: warning: passing argument 2 of 'tty_do_resize' from incompatible pointer type
> drivers/char/hvc_console.c:532: error: too many arguments to function 'tty_do_resize'
> 
> Caused by commit eb6ab2d361a49470ca9785c70482772c19e49bec
> ("pty-simplify-resize") from the ttydev tree interacting with commit
> febde3711992a64ea83a47a719f68a90c4b0927a ("hvc_console: Add support for
> tty window resizing").
> 
> The former added another call to the function that the latter changed.
> 
> I applied the following patch

Patch is correct.

Do the hvc patches have dependancies on the PPC tree as well as the tty
tree ?
Benjamin Herrenschmidt - Oct. 23, 2008, 7:35 a.m.
On Thu, 2008-10-23 at 08:34 +0100, Alan Cox wrote:
> 
> Patch is correct.
> 
> Do the hvc patches have dependancies on the PPC tree as well as the
> tty tree ?

Note that I have a serie of 5 hvc patches in the ppc tree...

Ben.
Hendrik Brueckner - Oct. 23, 2008, 10:28 a.m.
On Thu, Oct 23, 2008 at 05:29:38PM +1100, Stephen Rothwell wrote:
> drivers/char/hvc_console.c: In function 'hvc_set_winsz':
> drivers/char/hvc_console.c:532: warning: passing argument 2 of 'tty_do_resize' from incompatible pointer type
> drivers/char/hvc_console.c:532: error: too many arguments to function 'tty_do_resize'
> 
> Caused by commit eb6ab2d361a49470ca9785c70482772c19e49bec
> ("pty-simplify-resize") from the ttydev tree interacting with commit
> febde3711992a64ea83a47a719f68a90c4b0927a ("hvc_console: Add support for
> tty window resizing").
> 
> The former added another call to the function that the latter changed.
In linux-next, the pty-simplify-resize patch has changed the
tty_do_resize() signature; and therefore the hvc patch did not compile.

> I applied the following patch.
The patch is correct.
Thanks.

Acked-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Stephen Rothwell - Oct. 24, 2008, 4:58 a.m.
Hi Alan, Hendrik,

On Thu, 23 Oct 2008 08:34:06 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> On Thu, 23 Oct 2008 17:29:38 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi Alan,
> > 
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > drivers/char/hvc_console.c: In function 'hvc_set_winsz':
> > drivers/char/hvc_console.c:532: warning: passing argument 2 of 'tty_do_resize' from incompatible pointer type
> > drivers/char/hvc_console.c:532: error: too many arguments to function 'tty_do_resize'
> > 
> > Caused by commit eb6ab2d361a49470ca9785c70482772c19e49bec
> > ("pty-simplify-resize") from the ttydev tree interacting with commit
> > febde3711992a64ea83a47a719f68a90c4b0927a ("hvc_console: Add support for
> > tty window resizing").
> > 
> > The former added another call to the function that the latter changed.
> > 
> > I applied the following patch
> 
> Patch is correct.
> 
> Do the hvc patches have dependancies on the PPC tree as well as the tty
> tree ?

The powerpc patches including these hvc_console patches have now gone
upstream to Linus' tree ...

Patch

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 5b819b1..65f88ef 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -529,7 +529,7 @@  static void hvc_set_winsz(struct work_struct *work)
 	tty = tty_kref_get(hp->tty);
 	spin_unlock_irqrestore(&hp->lock, hvc_flags);
 
-	tty_do_resize(tty, tty, &ws);
+	tty_do_resize(tty, &ws);
 	tty_kref_put(tty);
 }