diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 05:29:18 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 05:29:18 +0400 |
| commit | c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394 (patch) | |
| tree | d159b9722131e32288cd66030ee002e1ed808602 /drivers | |
| parent | c70662ec47191eb235bb1d0a1466b923b7a08a94 (diff) | |
| parent | 9c35e90c6fcf7f5baf27a63d9565e9f47633f299 (diff) | |
| download | linux-c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394.tar.xz | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/xen-blkfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index ac1b682edecb..ab735a605cf3 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -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)) |