Re: [PATCH] PCI: Document that most pci options are shared between i386 and x86-64

Previous thread: [PATCH] SG_IO block filter whitelist missing MMC SET READ AHEAD command by xiphmont on Friday, August 22, 2008 - 12:36 am. (1 message)

Next thread: Re: [PATCH] SG_IO block filter whitelist missing MMC SET READ AHEAD command by Jens Axboe on Friday, August 22, 2008 - 1:03 am. (1 message)
From: Andi Kleen
Date: Friday, August 22, 2008 - 12:53 am

PCI: Document that most pci options are shared between i386 and x86-64
    
Since the code is shared pretty much most of the pci= options are shared,
but kernel-parameters.txt marked most of them as i386 only.
    
Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a897646..fda8faf 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -101,6 +101,7 @@ parameter is applicable:
 	X86-64	X86-64 architecture is enabled.
 			More X86-64 boot options can be found in
 			Documentation/x86_64/boot-options.txt .
+	X86	Either 32bit or 64bit x86 (same as X86-32+X86-64)
 
 In addition, the following text indicates that the option:
 
@@ -1541,7 +1542,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See also Documentation/paride.txt.
 
 	pci=option[,option...]	[PCI] various PCI subsystem options:
-		off		[X86-32] don't probe for the PCI bus
+		off		[X86] don't probe for the PCI bus
 		bios		[X86-32] force use of PCI BIOS, don't access
 				the hardware directly. Use this if your machine
 				has a non-standard PCI host bridge.
@@ -1549,9 +1550,9 @@ and is between 256 and 4096 characters. It is defined in the file
 				hardware access methods are allowed. Use this
 				if you experience crashes upon bootup and you
 				suspect they are caused by the BIOS.
-		conf1		[X86-32] Force use of PCI Configuration
+		conf1		[X86] Force use of PCI Configuration
 				Mechanism 1.
-		conf2		[X86-32] Force use of PCI Configuration
+		conf2		[X86] Force use of PCI Configuration
 				Mechanism 2.
 		noaer		[PCIE] If the PCIEAER kernel config parameter is
 				enabled, this kernel boot option can be used to
@@ -1571,37 +1572,37 @@ and is between 256 and 4096 characters. It is defined in the file
 				this option if the kernel is unable to allocate
 				IRQs or discover secondary PCI buses on your
 				motherboard.
-		rom		[X86-32] Assign ...
From: Jesse Barnes
Date: Wednesday, August 27, 2008 - 4:37 pm

Yeah this should make things less confusing, applied to linux-next, thanks.

Jesse
--

Previous thread: [PATCH] SG_IO block filter whitelist missing MMC SET READ AHEAD command by xiphmont on Friday, August 22, 2008 - 12:36 am. (1 message)

Next thread: Re: [PATCH] SG_IO block filter whitelist missing MMC SET READ AHEAD command by Jens Axboe on Friday, August 22, 2008 - 1:03 am. (1 message)