diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 18:29:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 18:29:18 -0700 |
| commit | c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394 (patch) | |
| tree | d159b9722131e32288cd66030ee002e1ed808602 /Documentation | |
| parent | c70662ec47191eb235bb1d0a1466b923b7a08a94 (diff) | |
| parent | 9c35e90c6fcf7f5baf27a63d9565e9f47633f299 (diff) | |
| download | kernel-common-c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394.tar.gz kernel-common-c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394.tar.bz2 kernel-common-c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394.zip | |
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 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 2c85c0692b01..f084af0cb8e0 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2629,8 +2629,10 @@ and is between 256 and 4096 characters. It is defined in the file aux-ide-disks -- unplug non-primary-master IDE devices nics -- unplug network devices all -- unplug all emulated devices (NICs and IDE disks) - ignore -- continue loading the Xen platform PCI driver even - if the version check failed + unnecessary -- unplugging emulated devices is + unnecessary even if the host did not respond to + the unplug protocol + never -- do not unplug even if version check succeeds xirc2ps_cs= [NET,PCMCIA] Format: |