From: Michael S. Tsirkin <mst@redhat.com>
Date: Fri, 17 May 2013 01:14:15 +0000 (+0930)
Subject: virtio_console: fix uapi header
X-Git-Tag: v3.4.93~28
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=6c9f8a4940df47e650d39216de7bc8f21e18e2fa;p=unionfs-2.6.23.y.git

virtio_console: fix uapi header

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>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h
index bdf4b003473..82e12ad3d97 100644
--- a/include/linux/virtio_console.h
+++ b/include/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 */