2.2.18 source patch; libc6-dev internal conflict?

[Adam C Powell IV <hazelsct@mit.edu>]

Greetings,

More "new input layer" drama...

I got and unpacked kernel-source-2.2.18, copied /boot/config-2.2.18pre21
to .config, did make oldconfig (which changed nothing) and make-kpkg
kernel_image.  A pretty straightforward kernel build, which I'm doing to
try the openafs modules.

But it died in drivers/macintosh/mac_hid.c with:

mac_hid.c: In function `mac_hid_sysctl_keycodes':
mac_hid.c:296: structure has no member named `ppc_kbd_sysrq_xlate'
mac_hid.c:303: structure has no member named `ppc_kbd_sysrq_xlate'

The attached patch lets it build, but I haven't yet tried booting it.

Unfortunately, openafs doesn't support 2.2 on PPC (yet?), so I patched
it and tried to build it for 2.4.0-test12, details including the patch
can be found at bug #80835.  Patched as such, it failed on a curious
error, which can be found in that bug, but I'll repeat it here for
discussion, as it appears to indicate an internal conflict within
libc6-dev:

cc -Dppc_linux24 -O2 -I.
-I/usr/src/modules/openafs/ppc_linux24/dest/include  -O2 -g    -c -o
partition.o partition.c
In file included from
/usr/src/modules/openafs/ppc_linux24/dest/include/rx/rx.h:58,
                 from
/usr/src/modules/openafs/ppc_linux24/dest/include/afs/afsint.h:62,
                 from partition.c:93:
/usr/include/netinet/in.h:256: warning: `ntohl' redefined
/usr/include/linux/byteorder/generic.h:169: warning: this is the
location of the previous definition
/usr/include/netinet/in.h:257: warning: `ntohs' redefined
/usr/include/linux/byteorder/generic.h:175: warning: this is the
location of the previous definition
/usr/include/netinet/in.h:258: warning: `htonl' redefined
/usr/include/linux/byteorder/generic.h:168: warning: this is the
location of the previous definition
/usr/include/netinet/in.h:259: warning: `htons' redefined
/usr/include/linux/byteorder/generic.h:174: warning: this is the
location of the previous definition
In file included from
/usr/src/modules/openafs/ppc_linux24/dest/include/rx/rx.h:58,
                 from
/usr/src/modules/openafs/ppc_linux24/dest/include/afs/afsint.h:62,
                 from partition.c:93:
/usr/include/netinet/in.h:236: `__u32' redeclared as different kind of
symbol
/usr/include/asm/types.h:18: previous declaration of `__u32'
/usr/include/netinet/in.h:238: `__u16' redeclared as different kind of
symbol
/usr/include/asm/types.h:15: previous declaration of `__u16'
make[3]: *** [partition.o] Error 1
make[3]: Leaving directory
`/usr/src/modules/openafs/ppc_linux24/obj/vol'

The first bunch I think I understand, but the __u32 and __u16 parts are
beyond me...

Thanks,

-Adam P.

          Welcome to the best software in the world today cafe!

--- drivers/macintosh/mac_hid.c.bak	Thu Dec 28 23:21:37 2000
+++ drivers/macintosh/mac_hid.c	Thu Dec 28 23:23:19 2000
@@ -293,14 +293,14 @@
 	    && keyboard_sends_linux_keycodes != val) {
 		if (!keyboard_sends_linux_keycodes) {
 #ifdef CONFIG_MAGIC_SYSRQ
-			ppc_md.ppc_kbd_sysrq_xlate   = mac_hid_kbd_sysrq_xlate;
+			ppc_md.sysrq_xlate   = mac_hid_kbd_sysrq_xlate;
 			SYSRQ_KEY                = 0x69;
 #endif
 			memcpy(pc_key_maps_save, key_maps, sizeof(key_maps));
 			memcpy(key_maps, mac_key_maps_save, sizeof(key_maps));
 		} else {
 #ifdef CONFIG_MAGIC_SYSRQ
-			ppc_md.ppc_kbd_sysrq_xlate   = pckbd_sysrq_xlate;
+			ppc_md.sysrq_xlate   = pckbd_sysrq_xlate;
 			SYSRQ_KEY                = 0x54;
 #endif
 			memcpy(mac_key_maps_save, key_maps, sizeof(key_maps));