diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 12:38:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 12:38:19 +1000 |
| commit | 97f7e315f7623fd6e5be3f9cadc9944e7ed1174f (patch) | |
| tree | 2e4488fe49dde6bcd7092dc7a87f48f1507242f1 /Documentation | |
| parent | 8a209f798a745276465f07f224832cfe98f16ad1 (diff) | |
| parent | 7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1 (diff) | |
Merge remote branch 'xen/upstream/xen'
Conflicts:
drivers/xen/Kconfig
drivers/xen/Makefile
include/xen/xen-ops.h
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b7d450635b16..7124c3d1e4dc 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -116,6 +116,7 @@ parameter is applicable: More X86-64 boot options can be found in Documentation/x86/x86_64/boot-options.txt . X86 Either 32bit or 64bit x86 (same as X86-32+X86-64) + XEN Xen support is enabled In addition, the following text indicates that the option: @@ -2608,6 +2609,16 @@ and is between 256 and 4096 characters. It is defined in the file xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks. xd_geo= See header of drivers/block/xd.c. + xen_emul_unplug= [HW,X86,XEN] + Unplug Xen emulated devices + Format: [unplug0,][unplug1] + ide-disks -- unplug primary master IDE devices + 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 + xirc2ps_cs= [NET,PCMCIA] Format: <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]] |