mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6
* 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6: xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield xen: pvhvm: rename xen_emul_unplug=ignore to =unnnecessary xen: pvhvm: allow user to request no emulated device unplug
This commit is contained in:
commit
c05e1e23b8
4 changed files with 26 additions and 14 deletions
|
|
@ -834,7 +834,7 @@ static int blkfront_probe(struct xenbus_device *dev,
|
|||
char *type;
|
||||
int len;
|
||||
/* no unplug has been done: do not hook devices != xen vbds */
|
||||
if (xen_platform_pci_unplug & XEN_UNPLUG_IGNORE) {
|
||||
if (xen_platform_pci_unplug & XEN_UNPLUG_UNNECESSARY) {
|
||||
int major;
|
||||
|
||||
if (!VDEV_IS_EXTENDED(vdevice))
|
||||
|
|
|
|||
Loading…
Reference in a new issue