From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jul 2013 20:09:06 +0000 (-0700)
Subject: Merge tags 'modules-next-for-linus' and 'virtio-next-for-linus' of git://git.kernel... 
X-Git-Tag: firefly_0821_release~176^2~5794
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=baa6f8209312f9734434b89c12497774eea1cbe1;p=firefly-linux-kernel-4.4.55.git

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

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
---

baa6f8209312f9734434b89c12497774eea1cbe1
diff --cc include/uapi/linux/virtio_console.h
index c312f16bc4e7,ee13ab6c3614,3fd0dce3cb25..ba260dd0b33a
--- a/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 */