From: Greg Kroah-Hartman Date: Wed, 22 May 2013 16:34:23 +0000 (-0700) Subject: 3.9-stable patches X-Git-Tag: v3.0.80~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb04d4a89099c37e54fa4e2f36add4c6521bc985;p=thirdparty%2Fkernel%2Fstable-queue.git 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 48b243e5980..09e04aaee40 100644 --- 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 index 00000000000..252e5b9c453 --- /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" +Date: Fri, 17 May 2013 10:44:15 +0930 +Subject: virtio_console: fix uapi header + +From: "Michael S. Tsirkin" + +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 +Signed-off-by: Rusty Russell +Signed-off-by: Greg Kroah-Hartman + +--- + 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 */