summaryrefslogtreecommitdiff
path: root/toolchain/kernel-headers/linux-2.6.28.3-fix-serial.h-include.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-02-02 20:13:57 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-02-02 20:13:57 +0000
commitca1c4ce743286cf3c9cc93f86072dd9b9c515c8d (patch)
treeae188955aa3b2f65753f87b1bb58a2544619e7d8 /toolchain/kernel-headers/linux-2.6.28.3-fix-serial.h-include.patch
parent25b41e7e6a9c89361de56f8c1d304a490785d18d (diff)
kernel-headers: bump 2.6.27/2.6.28 stable versions
Diffstat (limited to 'toolchain/kernel-headers/linux-2.6.28.3-fix-serial.h-include.patch')
-rw-r--r--toolchain/kernel-headers/linux-2.6.28.3-fix-serial.h-include.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/toolchain/kernel-headers/linux-2.6.28.3-fix-serial.h-include.patch b/toolchain/kernel-headers/linux-2.6.28.3-fix-serial.h-include.patch
new file mode 100644
index 000000000..f6504aaab
--- /dev/null
+++ b/toolchain/kernel-headers/linux-2.6.28.3-fix-serial.h-include.patch
@@ -0,0 +1,55 @@
+From 60c20fb8c00a2b23308ae4517f145383bc66d291 Mon Sep 17 00:00:00 2001
+From: Andy Whitcroft <apw@canonical.com>
+Date: Fri, 2 Jan 2009 13:49:04 +0000
+Subject: [PATCH] serial: RS485 ioctl structure uses __u32 include linux/types.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+In the commit below a new struct serial_rs485 was introduced for a new
+ioctl:
+
+ commit c26c56c0f40e200e61d1390629c806f6adaffbcc
+ Author: Alan Cox <alan@redhat.com>
+ Date: Mon Oct 13 10:37:48 2008 +0100
+
+ tty: Cris has a nice RS485 ioctl so we should steal it
+
+This structure uses the __u32 types for some of its members, which leads
+to the following compile error:
+
+ $ cc -I.../include -c X.c
+ In file included from X.c:2: .../include/linux/serial.h:185:
+ error: expected specifier-qualifier-list before ‘__u32’
+ $
+
+It seems that these types are appropriate for this structure as it is
+to be exposed to userspace. These types are available via linux/types.h
+so move the include of that outside the __KERNEL__ section.
+
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Alan Cox <alan@redhat.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ include/linux/serial.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/include/linux/serial.h b/include/linux/serial.h
+index 1ea8d92..9136cc5 100644
+--- a/include/linux/serial.h
++++ b/include/linux/serial.h
+@@ -10,8 +10,9 @@
+ #ifndef _LINUX_SERIAL_H
+ #define _LINUX_SERIAL_H
+
+-#ifdef __KERNEL__
+ #include <linux/types.h>
++
++#ifdef __KERNEL__
+ #include <asm/page.h>
+
+ /*
+--
+1.5.6.5
+