From patchwork Thu Oct 23 06:29:38 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 5424 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 75D59DE00B for ; Thu, 23 Oct 2008 17:29:58 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from smtps.tip.net.au (chilli.pcug.org.au [203.10.76.44]) by ozlabs.org (Postfix) with ESMTP id E2795DDF04 for ; Thu, 23 Oct 2008 17:29:42 +1100 (EST) Received: from ash.ozlabs.ibm.com (bh02i525f01.au.ibm.com [202.81.18.30]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by smtps.tip.net.au (Postfix) with ESMTP id 134EC368009; Thu, 23 Oct 2008 17:29:40 +1100 (EST) Date: Thu, 23 Oct 2008 17:29:38 +1100 From: Stephen Rothwell To: Alan Cox Subject: linux-next: ttydev tree build failure Message-Id: <20081023172938.0460b191.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i486-pc-linux-gnu) Mime-Version: 1.0 Cc: linux-next@vger.kernel.org, Hendrik Brueckner , ppc-dev X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org 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. Acked-by: Hendrik Brueckner 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); }