Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751504Ab0HUHkZ (ORCPT ); Sat, 21 Aug 2010 03:40:25 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:55023 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751335Ab0HUHkX (ORCPT ); Sat, 21 Aug 2010 03:40:23 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=bjEkWJI1bT5cUzVzatG5jeLBmZ0oizD2PgQHZTE3IjKBPvOh4wdYCHy1mpbmAFneyA w4PHCr7FMRX4esapBytWa0D9RBHzEZXSqBNp1yzxv5yXMXOH4M1lbsCIs+NEYATF3OOO RKShAZQMrpEfcwne8vxo5GzCq6g5SkAZDGUTI= Date: Sat, 21 Aug 2010 00:40:19 -0700 From: Dmitry Torokhov To: Sachin Sant Cc: schwidefsky@de.ibm.com, linux-s390@vger.kernel.org, heiko.carstens@de.ibm.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org Subject: Re: [-next PATCH] Fix s390 keyboard driver build break Message-ID: <20100821074018.GB2160@core.coreip.homeip.net> References: <20100821072126.8965.41003.sendpatchset@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100821072126.8965.41003.sendpatchset@localhost.localdomain> User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1561 Lines: 42 Hi Sachin, On Sat, Aug 21, 2010 at 12:51:26PM +0530, Sachin Sant wrote: > Next 20100820 fails to build on s390 with > > drivers/s390/char/keyboard.c: In function 'kbd_keycode': > drivers/s390/char/keyboard.c:308: error: too many arguments to function 'handle_sysrq' > make[2]: *** [drivers/s390/char/keyboard.o] Error 1 > > The following commit changed handle_sysrq() function to accept single argument. > > commit a821bafce37b26499e2bfbf2e6b96b0636efc014 > Input: sysrq - drop tty argument form handle_sysrq() > > Adapt the code accordingly to fix the build break. > > Signed-off-by: Sachin Sant > --- > > diff -Naurp next20100820/drivers/s390/char/keyboard.c next20100820-new//drivers/s390/char/keyboard.c > --- next20100820/drivers/s390/char/keyboard.c 2010-08-16 06:11:37.000000000 +0530 > +++ next20100820-new//drivers/s390/char/keyboard.c 2010-08-21 11:55:25.000000000 +0530 > @@ -305,7 +305,7 @@ kbd_keycode(struct kbd_data *kbd, unsign > if (kbd->sysrq) { > if (kbd->sysrq == K(KT_LATIN, '-')) { > kbd->sysrq = 0; > - handle_sysrq(value, kbd->tty); > + handle_sysrq(value); > return; > } > if (value == '-') { Thank you very much for the patch. I folded it into original patch to avoid build failures in case someone needs to bisect. -- Dmitry -- 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/