diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-11-28 16:21:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-29 09:24:52 -0800 |
| commit | 79288f5e935cb445220eef83f3f793159555f9ae (patch) | |
| tree | a32eeeeeea5b530c44165ab81d1b069afad381df /include/linux/kd.h | |
| parent | fd79b77117f16264206ed2618199d42e93cc8f09 (diff) | |
| download | linux-79288f5e935cb445220eef83f3f793159555f9ae.tar.gz linux-79288f5e935cb445220eef83f3f793159555f9ae.tar.bz2 linux-79288f5e935cb445220eef83f3f793159555f9ae.zip | |
Fix <linux/kd.h> usage in userspace
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.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/kd.h')
| -rw-r--r-- | include/linux/kd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kd.h b/include/linux/kd.h index c91fc0c9c495..15f2853ea58f 100644 --- 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 */ |