rpms/kernel/devel linux-2.6-fix-kd.h.patch, NONE, 1.1 kernel.spec, 1.248, 1.249

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6269

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fix-kd.h.patch 
Log Message:
Fix kd.h in kernel-headers

linux-2.6-fix-kd.h.patch:

--- NEW FILE linux-2.6-fix-kd.h.patch ---
>From dwmw2 at infradead.org Wed Nov 21 14:04:47 2007
Subject: [PATCH] Fix <linux/kd.h> usage in userspace.
From: David Woodhouse <dwmw2 at infradead.org>
To: Samuel Thibault <samuel.thibault at ens-lyon.org>
Cc: akpm at linux-foundation.org, drepper at redhat.com,  torvalds at linux-foundation.org, adaplas at pol.net, heiko.carstens at de.ibm.com,  jengelh at gmx.de, schwidefsky at de.ibm.com, varekova at redhat.com
In-Reply-To: <20071121184528.GR4195 at implementation.uk.xensource.com>
References: <200710170619.l9H6Jv24005905 at imap1.linux-foundation.org>
	 <1195668160.20963.188.camel at shinybook.infradead.org>
	 <20071121181150.GO4195 at implementation.uk.xensource.com>
	 <1195670452.20963.212.camel at shinybook.infradead.org>
	 <20071121184528.GR4195 at implementation.uk.xensource.com>
Content-Type: text/plain
Message-Id: <1195671880.20963.235.camel at shinybook.infradead.org>
Mime-Version: 1.0
X-Mailer: Evolution 2.12.1 (2.12.1-3.fc8.dwmw2.1) 
Date: Wed, 21 Nov 2007 14:04:47 -0500
X-Evolution-Format: text/plain
X-Evolution-Account: 0
X-Evolution-Transport:
	smtp://dwmw2;auth=CRAM-MD5@pentafluge.infradead.org:587/;use_ssl=when-possible
X-Evolution-Fcc: imap://dwmw2@baythorne.infradead.org/outgoing
X-Evolution-Source: imap://dwmw2@baythorne.infradead.org/
Content-Transfer-Encoding: 8bit

For reasons unclear to me, glibc's <sys/kd.h> deliberately defeats the
attempt we make in <linux/kd.h> to include <linux/types.h>

For now, change the one instance of __u32 to 'unsigned int' instead
because it's breaking userspace. We should probably also remove our
inclusion of <linux/types.h>, since we don't use it -- but that's not a
change to make in -rc.

Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

--- a/include/linux/kd.h
+++ b/include/linux/kd.h
@@ -126,7 +126,7 @@ struct kbdiacrs {
 #define KDSKBDIACR      0x4B4B  /* write kernel accent table */
 
 struct kbdiacruc {
-        __u32 diacr, base, result;
+        unsigned int diacr, base, result;
 };
 struct kbdiacrsuc {
         unsigned int kb_cnt;    /* number of entries in following array */

-- 
dwmw2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- kernel.spec	19 Nov 2007 05:17:11 -0000	1.248
+++ kernel.spec	21 Nov 2007 19:24:08 -0000	1.249
@@ -627,6 +627,7 @@
 Patch1509: linux-2.6-xfs-setfattr-32bit-compat.patch
 Patch1515: linux-2.6-lirc.patch
 Patch1520: linux-2.6-dcdbas-autoload.patch
+Patch1530: linux-2.6-fix-kd.h.patch
 
 #nouveau + drm fixes
 Patch1801: nouveau-drm.patch
@@ -1136,6 +1137,9 @@
 # DMI autoloading for dcdbas driver
 ApplyPatch linux-2.6-dcdbas-autoload.patch
 
+# Fix <linux/kd.h> to work with glibc's <sys/kd.h>
+ApplyPatch linux-2.6-fix-kd.h.patch
+
 ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
 
 # ---------- below all scheduled for 2.6.24 -----------------
@@ -1695,6 +1699,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Wed Nov 21 2007 David Woodhouse <dwmw2 at redhat.com>
+- Fix <linux/kd.h> in userspace.
+
 * Sun Nov 18 2007 Kyle McMartin <kmcmartin at redhat.com>
 - 2.6.24-rc3-git1