From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sachin Sant Subject: Re: next Jan 6: drivers/s390/char/defkeymap build break Date: Thu, 07 Jan 2010 11:33:51 +0530 Message-ID: <4B457947.2040004@in.ibm.com> References: <20100106180342.43844983.sfr@canb.auug.org.au> <4B445470.8010402@in.ibm.com> <4B44B6F8.9070209@windriver.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from e28smtp04.in.ibm.com ([122.248.162.4]:39655 "EHLO e28smtp04.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932336Ab0AGGD4 (ORCPT ); Thu, 7 Jan 2010 01:03:56 -0500 In-Reply-To: <4B44B6F8.9070209@windriver.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Jason Wessel Cc: linux-s390@vger.kernel.org, Stephen Rothwell , linux-next@vger.kernel.org, Heiko Carstens Jason Wessel wrote: > Sachin Sant wrote: > >> Today's next fails to build on s390 with >> >> CC drivers/s390/char/defkeymap.o >> drivers/s390/char/defkeymap.c:30: error: static declaration of 'shift_map' follows non-static declaration >> include/linux/keyboard.h:31: error: previous declaration of 'shift_map' was here >> drivers/s390/char/defkeymap.c:49: error: static declaration of 'ctrl_map' follows non-static declaration >> include/linux/keyboard.h:32: error: previous declaration of 'ctrl_map' was here >> make[2]: *** [drivers/s390/char/defkeymap.o] Error 1 >> make[1]: *** [drivers/s390/char] Error 2 >> >> Probable cause could be commit 91570de.. >> kgdboc,keyboard: Keyboard driver for kdb with kgdb >> >> Thanks >> -Sachin >> >> >> > I had patched the include/linux/keyboard.h originally to expose the > definition which was already a global symbol. It turns out the > kdb_keyboard.c implementation should not be accessing shift_map[] > directly. It is accessed through a pointer to the data found in key_maps[]. > > I folded in a change to this patch to not modify > include/linux/keyboard.h and to fix the kdb keyboard code to use key_maps[]. > > Hopefully that fixes the problem. Attached is the folded patch, which > reverts include/linux/keyboard.h to be unmodified by the kdb series. > Yup that works. Thanks -- --------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------