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.

Thanks,
Jason.