Merge tags 'modules-next-for-linus' and 'virtio-next-for-linus' of git://git.kernel...

Pull trivial module and virtio fixes from Rusty Russell.

Apparently these were meant for 3.10, but came in after the release.

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  modpost.c: Add .text.unlikely to TEXT_SECTIONS

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio: remove virtqueue_add_buf().
  lguest: rename i386_head.S
  virtio_blk: Add missing 'static' qualifiers
  virtio: console: Add emergency writeonly register to config space
  virtio_pci: better macro exported in uapi

diff --cc include/uapi/linux/virtio_console.h
index c312f16bc4e7e692f4117b0a9280cadf1977f8db,ee13ab6c361409b31216da2e54790f804401fe51,3fd0dce3cb25d2aa26caeb518caff2cdc3a9177b..ba260dd0b33aece9b8ba983b9914583ff7b48e6c
--- 1/include/uapi/linux/virtio_console.h
--- 2/include/uapi/linux/virtio_console.h
--- 3/include/uapi/linux/virtio_console.h
+++ b/include/uapi/linux/virtio_console.h
@@@@ -38,8 -38,8 -38,9 +38,9 @@@@
   /* Feature bits */
   #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_F_EMERG_WRITE 2 /* Does host support emergency write? */
   
 --#define VIRTIO_CONSOLE_BAD_ID                (~(u32)0)
 ++#define VIRTIO_CONSOLE_BAD_ID                (~(__u32)0)
   
   struct virtio_console_config {
        /* colums of the screens */