diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 07:16:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 07:16:49 -0700 |
| commit | 94f1be9798c88b030256bdeb533008c3d55ec2c6 (patch) | |
| tree | e73baba68b700e50cab2a22025f85c0455df5470 /include/uapi/linux/virtio_console.h | |
| parent | 519fe2ecb755b875d9814cdda19778c2e88c6901 (diff) | |
| parent | 6407d75afd08545f2252bb39806ffd3f10c7faac (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull virtio fixes from Rusty Russell:
"A build fix and a uapi exposure fix. The build fix is later than I
liked, but my first version broke linux-next due to overzealous header
clean."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
virtio_console: fix uapi header
Hoist memcpy_fromiovec/memcpy_toiovec into lib/
Diffstat (limited to 'include/uapi/linux/virtio_console.h')
| -rw-r--r-- | include/uapi/linux/virtio_console.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_console.h b/include/uapi/linux/virtio_console.h index ee13ab6c3614..c312f16bc4e7 100644 --- 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 */ |