[Xen-changelog] [linux-2.6.18-xen] dom0 linux: Fix descriptions in kernel-parameters.txt

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1237457139 0
# Node ID 071ee07f92261a07935f9cf79d453c4e1039647c
# Parent  4839e34e67952b540fa258811324a85ace7feb79
dom0 linux: Fix descriptions in kernel-parameters.txt

Signed-off-by: Yuji Shimada <shimada-yxb@xxxxxxxxxxxxxxx>
---
 Documentation/kernel-parameters.txt |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff -r 4839e34e6795 -r 071ee07f9226 Documentation/kernel-parameters.txt
--- a/Documentation/kernel-parameters.txt       Wed Mar 18 15:43:57 2009 +0000
+++ b/Documentation/kernel-parameters.txt       Thu Mar 19 10:05:39 2009 +0000
@@ -574,6 +574,13 @@ running once the system is up.
                        Format: <io>
 
        gt96100eth=     [NET] MIPS GT96100 Advanced Communication Controller
+
+       guestdev=       [PCI,ACPI]
+                       Format: <device path>[,<device path>[,...]]
+                       Format of device path: 
<hid>[:<uid>]-<dev>.<func>[-<dev>.<func>[...]]
+                       Specifies PCI device for guest domain.
+                       If PCI-PCI bridge is specified, all PCI devices
+                       behind PCI-PCI bridge are reserved.
 
        gus=            [HW,OSS]
                        Format: <io>,<irq>,<dma>,<dma16>
@@ -1240,21 +1247,6 @@ running once the system is up.
                                bootloader. This is currently used on
                                IXP2000 systems where the bus has to be
                                configured a certain way for adjunct CPUs.
-               reassigndev=
-                               Format: 
[<segment>:]<bus>:<dev>.<func>[,[<segment>:]<bus>:<dev>.<func>[,...]]
-                               Specifies device to reassign page-aligned memory
-                               resources. PCI-PCI bridge can be specified, if
-                               resource windows need to be expanded.
-               reassign_resources
-                               Use guestdev parameter to reassign device's
-                               resources.
-               guestdev=
-                               Format: <device path>[,<device path>[,...]]
-                               Format of device path: 
<hid>[:<uid>]-<dev>.<func>[-<dev>.<func>[...]]
-                               Specifies PCI device for guest domain.
-                               If PCI-PCI bridge is specified, all
-                               PCI devices behind PCI-PCI bridge are
-                               reserved.
 
        pcmv=           [HW,PCMCIA] BadgePAD 4
 
@@ -1372,6 +1364,16 @@ running once the system is up.
                        Run specified binary instead of /init from the ramdisk,
                        used for early userspace startup. See initrd.
 
+       reassigndev=    [PCI]
+                       Format: 
[<segment>:]<bus>:<dev>.<func>[,[<segment>:]<bus>:<dev>.<func>[,...]]
+                       Specifies device to reassign page-aligned memory
+                       resources. PCI-PCI bridge can be specified, if
+                       resource windows need to be expanded.
+
+       reassign_resources
+                       [PCI,ACPI] Use guestdev parameter to reassign device's
+                       resources.
+
        reboot=         [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
                        Format: <reboot_mode>[,<reboot_mode2>[,...]]
                        See arch/*/kernel/reboot.c.

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog