rpms/kernel/devel linux-2.6-serial.patch, NONE, 1.1 kernel.spec, 1.1176, 1.1177

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5447

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-serial.patch 
Log Message:
Allow packages that include <linux/serial.h> to build (#476327)


linux-2.6-serial.patch:

--- NEW FILE linux-2.6-serial.patch ---
From: Andy Whitcroft <apw at canonical.com>
Subject: [PATCH 1/1] serial: RS485 ioctl structure uses __u32 include linux/types.h
Date: Tue, 2 Dec 2008 11:00:25 +0000

In the commit below a new struct serial_rs485 was introduced for a new
ioctl:

    commit c26c56c0f40e200e61d1390629c806f6adaffbcc
    Author: Alan Cox <alan at 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 at canonical.com>
---
 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.6.0.4.911.gc990
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/




Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1176
retrieving revision 1.1177
diff -u -r1.1176 -r1.1177
--- kernel.spec	20 Dec 2008 21:51:49 -0000	1.1176
+++ kernel.spec	22 Dec 2008 15:37:30 -0000	1.1177
@@ -659,6 +659,9 @@
 # olpc fixes
 Patch2040: linux-2.6-olpc-speaker-out.patch
 
+# Fix serial header so things can compile (#476327)
+Patch2050: linux-2.6-serial.patch
+
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1172,6 +1175,8 @@
 
 ApplyPatch linux-2.6-olpc-speaker-out.patch
 
+ApplyPatch linux-2.6-serial.patch
+
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
@@ -1768,6 +1773,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Dec 22 2008 Bill Nottingham <notting at redhat.com>
+- Fix linux/serial.h so it can be included from userspace (#476327)
+
 * Sat Dec 20 2008 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.28-rc9-git1
   Rebased patches: