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

Commit 964fe080 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  move virtrng_remove to .devexit.text
  move virtballoon_remove to .devexit.text
  virtio_blk: Revert serial number support
  virtio: let header files include virtio_ids.h
  virtio_blk: revert QUEUE_FLAG_VIRT addition
parents 4848490c ff07eb89

Documentation/lguest/lguest.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <signal.h>

#include "linux/lguest_launcher.h"

#include "linux/virtio_config.h"

#include <linux/virtio_ids.h>

#include "linux/virtio_net.h"

#include "linux/virtio_blk.h"

#include "linux/virtio_console.h"

drivers/block/virtio_blk.c

+3 −36
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#include <linux/blkdev.h>

#include <linux/hdreg.h>

#include <linux/virtio.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_blk.h>

#include <linux/scatterlist.h>
@@ -183,34 +182,6 @@ static void do_virtblk_request(struct request_queue *q) 
		vblk->vq->vq_ops->kick(vblk->vq);

}



/* return ATA identify data

 */

static int virtblk_identify(struct gendisk *disk, void *argp)

{

	struct virtio_blk *vblk = disk->private_data;

	void *opaque;

	int err = -ENOMEM;



	opaque = kmalloc(VIRTIO_BLK_ID_BYTES, GFP_KERNEL);

	if (!opaque)

		goto out;



	err = virtio_config_buf(vblk->vdev, VIRTIO_BLK_F_IDENTIFY,

		offsetof(struct virtio_blk_config, identify), opaque,

		VIRTIO_BLK_ID_BYTES);



	if (err)

		goto out_kfree;



	if (copy_to_user(argp, opaque, VIRTIO_BLK_ID_BYTES))

		err = -EFAULT;



out_kfree:

	kfree(opaque);

out:

	return err;

}



static void virtblk_prepare_flush(struct request_queue *q, struct request *req)

{

	req->cmd_type = REQ_TYPE_LINUX_BLOCK;
@@ -222,10 +193,6 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, 
{

	struct gendisk *disk = bdev->bd_disk;

	struct virtio_blk *vblk = disk->private_data;

	void __user *argp = (void __user *)data;



	if (cmd == HDIO_GET_IDENTITY)

		return virtblk_identify(disk, argp);



	/*

	 * Only allow the generic SCSI ioctls if the host can support it.
@@ -233,7 +200,8 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, 
	if (!virtio_has_feature(vblk->vdev, VIRTIO_BLK_F_SCSI))

		return -ENOTTY;



	return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);

	return scsi_cmd_ioctl(disk->queue, disk, mode, cmd,

			      (void __user *)data);

}



/* We provide getgeo only to please some old bootloader/partitioning tools */
@@ -332,7 +300,6 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) 
	}



	vblk->disk->queue->queuedata = vblk;

	queue_flag_set_unlocked(QUEUE_FLAG_VIRT, vblk->disk->queue);



	if (index < 26) {

		sprintf(vblk->disk->disk_name, "vd%c", 'a' + index % 26);
@@ -445,7 +412,7 @@ static struct virtio_device_id id_table[] = { 
static unsigned int features[] = {

	VIRTIO_BLK_F_BARRIER, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX,

	VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE,

	VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_IDENTIFY, VIRTIO_BLK_F_FLUSH

	VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_FLUSH

};



/*

drivers/char/hw_random/virtio-rng.c

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/scatterlist.h>

#include <linux/spinlock.h>

#include <linux/virtio.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_rng.h>



/* The host will fill any buffer we give it with sweet, sweet randomness.  We
@@ -117,7 +116,7 @@ static int virtrng_probe(struct virtio_device *vdev) 
	return 0;

}



static void virtrng_remove(struct virtio_device *vdev)

static void __devexit virtrng_remove(struct virtio_device *vdev)

{

	vdev->config->reset(vdev);

	hwrng_unregister(&virtio_hwrng);

drivers/char/virtio_console.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/err.h>

#include <linux/init.h>

#include <linux/virtio.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_console.h>

#include "hvc_console.h"

drivers/net/virtio_net.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/ethtool.h>

#include <linux/module.h>

#include <linux/virtio.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_net.h>

#include <linux/scatterlist.h>

#include <linux/if_vlan.h>