version 3.9.2-1
This commit is contained in:
parent
52b3981bf2
commit
bd5d0c63a3
435
config-pvops
435
config-pvops
File diff suppressed because it is too large
Load Diff
@ -66,13 +66,12 @@ diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
|
|||||||
index 0982bcc..d62fe38 100644
|
index 0982bcc..d62fe38 100644
|
||||||
--- a/drivers/usb/host/Makefile
|
--- a/drivers/usb/host/Makefile
|
||||||
+++ b/drivers/usb/host/Makefile
|
+++ b/drivers/usb/host/Makefile
|
||||||
@@ -40,6 +40,8 @@ obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
|
@@ -40,5 +40,7 @@ obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
|
||||||
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
|
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
|
||||||
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
|
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
|
||||||
obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
|
obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
|
||||||
+obj-$(CONFIG_XEN_USBDEV_FRONTEND) += xen-usbfront.o
|
+obj-$(CONFIG_XEN_USBDEV_FRONTEND) += xen-usbfront.o
|
||||||
+obj-$(CONFIG_XEN_USBDEV_BACKEND) += xen-usbback/
|
+obj-$(CONFIG_XEN_USBDEV_BACKEND) += xen-usbback/
|
||||||
obj-$(CONFIG_MIPS_ALCHEMY) += alchemy-common.o
|
|
||||||
obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o
|
obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o
|
||||||
obj-$(CONFIG_USB_HCD_SSB) += ssb-hcd.o
|
obj-$(CONFIG_USB_HCD_SSB) += ssb-hcd.o
|
||||||
diff --git a/drivers/usb/host/xen-usbback/Makefile b/drivers/usb/host/xen-usbback/Makefile
|
diff --git a/drivers/usb/host/xen-usbback/Makefile b/drivers/usb/host/xen-usbback/Makefile
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
--- linux-3.4.1.orig/drivers/block/xen-blkfront.c 2012-06-01 09:18:44.000000000 +0200
|
--- linux-3.4.1.orig/drivers/block/xen-blkfront.c 2012-06-01 09:18:44.000000000 +0200
|
||||||
+++ linux-3.4.1/drivers/block/xen-blkfront.c 2012-07-15 15:54:31.350255623 +0200
|
+++ linux-3.4.1/drivers/block/xen-blkfront.c 2012-07-15 15:54:31.350255623 +0200
|
||||||
@@ -44,6 +44,7 @@
|
@@ -44,6 +44,7 @@
|
||||||
#include <linux/mutex.h>
|
|
||||||
#include <linux/scatterlist.h>
|
#include <linux/scatterlist.h>
|
||||||
#include <linux/bitmap.h>
|
#include <linux/bitmap.h>
|
||||||
|
#include <linux/list.h>
|
||||||
+#include <linux/fd.h>
|
+#include <linux/fd.h>
|
||||||
|
|
||||||
#include <xen/xen.h>
|
#include <xen/xen.h>
|
||||||
|
@ -6,8 +6,8 @@ index 4e86393..34493d7 100644
|
|||||||
unsigned long sector_size;
|
unsigned long sector_size;
|
||||||
unsigned int binfo;
|
unsigned int binfo;
|
||||||
int err;
|
int err;
|
||||||
- int barrier, flush, discard;
|
- int barrier, flush, discard, persistent;
|
||||||
+ int barrier, flush, discard, removable;
|
+ int barrier, flush, discard, persistent, removable;
|
||||||
|
|
||||||
switch (info->connected) {
|
switch (info->connected) {
|
||||||
case BLKIF_STATE_CONNECTED:
|
case BLKIF_STATE_CONNECTED:
|
||||||
@ -21,6 +21,6 @@ index 4e86393..34493d7 100644
|
|||||||
+ if (!err && removable)
|
+ if (!err && removable)
|
||||||
+ binfo |= VDISK_REMOVABLE;
|
+ binfo |= VDISK_REMOVABLE;
|
||||||
+
|
+
|
||||||
err = xlvbd_alloc_gendisk(sectors, info, binfo, sector_size);
|
err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
|
||||||
if (err) {
|
"feature-persistent", "%u", &persistent,
|
||||||
xenbus_dev_fatal(info->xbdev, err, "xlvbd_add at %s",
|
NULL);
|
||||||
|
@ -1 +1 @@
|
|||||||
3.7.6
|
3.9.2
|
||||||
|
Loading…
Reference in New Issue
Block a user