Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baa6f820 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tags 'modules-next-for-linus' and 'virtio-next-for-linus' of... 

Merge tags 'modules-next-for-linus' and 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/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
parents 76f7a102 06df44ee b3087e48

arch/x86/lguest/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y		:= i386_head.o boot.o

obj-y		:= head_32.o boot.o

CFLAGS_boot.o	:= $(call cc-option, -fno-stack-protector)

arch/x86/lguest/i386_head.S→arch/x86/lguest/head_32.S

+0 −0

File moved.

View file

drivers/block/virtio_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ module_param(use_bio, bool, S_IRUGO); 
static int major;

static DEFINE_IDA(vd_index_ida);



struct workqueue_struct *virtblk_wq;

static struct workqueue_struct *virtblk_wq;



struct virtio_blk

{

drivers/virtio/virtio_ring.c

+3 −34
Original line number Diff line number Diff line
@@ -295,37 +295,6 @@ static inline int virtqueue_add(struct virtqueue *_vq, 
	return 0;

}



/**

 * virtqueue_add_buf - expose buffer to other end

 * @vq: the struct virtqueue we're talking about.

 * @sg: the description of the buffer(s).

 * @out_num: the number of sg readable by other side

 * @in_num: the number of sg which are writable (after readable ones)

 * @data: the token identifying the buffer.

 * @gfp: how to do memory allocations (if necessary).

 *

 * Caller must ensure we don't call this with other virtqueue operations

 * at the same time (except where noted).

 *

 * Returns zero or a negative error (ie. ENOSPC, ENOMEM).

 */

int virtqueue_add_buf(struct virtqueue *_vq,

		      struct scatterlist sg[],

		      unsigned int out,

		      unsigned int in,

		      void *data,

		      gfp_t gfp)

{

	struct scatterlist *sgs[2];



	sgs[0] = sg;

	sgs[1] = sg + out;



	return virtqueue_add(_vq, sgs, sg_next_arr,

			     out, in, out ? 1 : 0, in ? 1 : 0, data, gfp);

}

EXPORT_SYMBOL_GPL(virtqueue_add_buf);



/**

 * virtqueue_add_sgs - expose buffers to other end

 * @vq: the struct virtqueue we're talking about.
@@ -473,7 +442,7 @@ EXPORT_SYMBOL_GPL(virtqueue_notify); 
 * virtqueue_kick - update after add_buf

 * @vq: the struct virtqueue

 *

 * After one or more virtqueue_add_buf calls, invoke this to kick

 * After one or more virtqueue_add_* calls, invoke this to kick

 * the other side.

 *

 * Caller must ensure we don't call this with other virtqueue
@@ -530,7 +499,7 @@ static inline bool more_used(const struct vring_virtqueue *vq) 
 * operations at the same time (except where noted).

 *

 * Returns NULL if there are no used buffers, or the "data" token

 * handed to virtqueue_add_buf().

 * handed to virtqueue_add_*().

 */

void *virtqueue_get_buf(struct virtqueue *_vq, unsigned int *len)

{
@@ -685,7 +654,7 @@ EXPORT_SYMBOL_GPL(virtqueue_enable_cb_delayed); 
 * virtqueue_detach_unused_buf - detach first unused buffer

 * @vq: the struct virtqueue we're talking about.

 *

 * Returns NULL or the "data" token handed to virtqueue_add_buf().

 * Returns NULL or the "data" token handed to virtqueue_add_*().

 * This is not valid on an active queue; it is useful only for device

 * shutdown.

 */

include/linux/virtio.h

+0 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ struct virtqueue { 
	void *priv;

};



int virtqueue_add_buf(struct virtqueue *vq,

		      struct scatterlist sg[],

		      unsigned int out_num,

		      unsigned int in_num,

		      void *data,

		      gfp_t gfp);



int virtqueue_add_outbuf(struct virtqueue *vq,

			 struct scatterlist sg[], unsigned int num,

			 void *data,