3.9-stable patches

added patches:
	virtio_console-fix-uapi-header.patch

diff --git a/queue-3.9/series b/queue-3.9/series
index 48b243e5980a57f0113f18489d7d4192e1ca7362..09e04aaee402c8ac64221708699141ee09350f37 100644 (file)
--- a/queue-3.9/series
+++ b/queue-3.9/series
@@ -7,3 +7,4 @@ i2c-designware-always-clear-interrupts-before-enabling-them.patch
 x86-fix-bit-corruption-at-cpu-resume-time.patch
 drm-nouveau-bios-fix-thinko-in-zm_mask_add-opcode.patch
 drm-radeon-fix-vram-size-calculation-for-vram-4gb.patch
+virtio_console-fix-uapi-header.patch

diff --git a/queue-3.9/virtio_console-fix-uapi-header.patch b/queue-3.9/virtio_console-fix-uapi-header.patch
new file mode 100644 (file)
index 0000000..252e5b9
--- /dev/null
+++ b/queue-3.9/virtio_console-fix-uapi-header.patch
@@ -0,0 +1,31 @@
+From 6407d75afd08545f2252bb39806ffd3f10c7faac Mon Sep 17 00:00:00 2001
+From: "Michael S. Tsirkin" <mst@redhat.com>
+Date: Fri, 17 May 2013 10:44:15 +0930
+Subject: virtio_console: fix uapi header
+
+From: "Michael S. Tsirkin" <mst@redhat.com>
+
+commit 6407d75afd08545f2252bb39806ffd3f10c7faac upstream.
+
+uapi should use __u32 not u32.
+Fix a macro in virtio_console.h which uses u32.
+
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/linux/virtio_console.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/uapi/linux/virtio_console.h
++++ b/include/uapi/linux/virtio_console.h
+@@ -39,7 +39,7 @@
+ #define VIRTIO_CONSOLE_F_SIZE 0       /* Does host provide console size? */
+ #define VIRTIO_CONSOLE_F_MULTIPORT 1  /* Does host provide multiple ports? */
+ 
+-#define VIRTIO_CONSOLE_BAD_ID         (~(u32)0)
++#define VIRTIO_CONSOLE_BAD_ID         (~(__u32)0)
+ 
+ struct virtio_console_config {
+       /* colums of the screens */