Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 6cececfcece2b072d29886ed7140495f3af17153

Authored by Jaswinder Singh Rajput
Committed by Ingo Molnar
1 parent ff6c6fed3a
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

x86, documentation: kernel-parameters replace X86-32,X86-64 with X86 

X86 is same as X86-32+X86-64 so replace X86-32,X86-64 with X86.

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
LKML-Reference: <1239698023.3033.37.camel@ht.satnam>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 20 additions and 20 deletions Side-by-side Diff

Documentation/kernel-parameters.txt
Diff comments   View file @ 6cececf
... ... @@ -134,7 +134,7 @@
134 134 ./include/asm/setup.h as COMMAND_LINE_SIZE.
135 135  
136 136  
137   - acpi= [HW,ACPI,X86-64,i386]
  137 + acpi= [HW,ACPI,X86]
138 138 Advanced Configuration and Power Interface
139 139 Format: { force | off | ht | strict | noirq | rsdt }
140 140 force -- enable ACPI if default was off
... ... @@ -218,7 +218,7 @@
218 218 acpi_osi="!string2" # remove built-in string2
219 219 acpi_osi= # disable all strings
220 220  
221   - acpi_pm_good [X86-32,X86-64]
  221 + acpi_pm_good [X86]
222 222 Override the pmtimer bug detection: force the kernel
223 223 to assume that this machine's pmtimer latches its value
224 224 and always returns good values.
... ... @@ -459,7 +459,7 @@
459 459 Also note the kernel might malfunction if you disable
460 460 some critical bits.
461 461  
462   - code_bytes [IA32/X86_64] How many bytes of object code to print
  462 + code_bytes [X86] How many bytes of object code to print
463 463 in an oops report.
464 464 Range: 0 - 8192
465 465 Default: 64
... ... @@ -592,7 +592,7 @@
592 592 MTRR settings. This parameter disables that behavior,
593 593 possibly causing your machine to run very slowly.
594 594  
595   - disable_timer_pin_1 [i386,x86-64]
  595 + disable_timer_pin_1 [X86]
596 596 Disable PIN 1 of APIC timer
597 597 Can be useful to work around chipset bugs.
598 598  
... ... @@ -624,7 +624,7 @@
624 624 UART at the specified I/O port or MMIO address.
625 625 The options are the same as for ttyS, above.
626 626  
627   - earlyprintk= [X86-32,X86-64,SH,BLACKFIN]
  627 + earlyprintk= [X86,SH,BLACKFIN]
628 628 earlyprintk=vga
629 629 earlyprintk=serial[,ttySn[,baudrate]]
630 630 earlyprintk=dbgp
... ... @@ -659,7 +659,7 @@
659 659 See Documentation/block/as-iosched.txt and
660 660 Documentation/block/deadline-iosched.txt for details.
661 661  
662   - elfcorehdr= [IA64,PPC,SH,X86-32,X86_64]
  662 + elfcorehdr= [IA64,PPC,SH,X86]
663 663 Specifies physical address of start of kernel core
664 664 image elf header. Generally kexec loader will
665 665 pass this option to capture kernel.
... ... @@ -938,7 +938,7 @@
938 938 See comment before marvel_specify_io7 in
939 939 arch/alpha/kernel/core_marvel.c.
940 940  
941   - io_delay= [X86-32,X86-64] I/O delay method
  941 + io_delay= [X86] I/O delay method
942 942 0x80
943 943 Standard port 0x80 based delay
944 944 0xed
... ... @@ -1000,7 +1000,7 @@
1000 1000  
1001 1001 keepinitrd [HW,ARM]
1002 1002  
1003   - kernelcore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter
  1003 + kernelcore=nn[KMG] [KNL,X86,IA-64,PPC] This parameter
1004 1004 specifies the amount of memory usable by the kernel
1005 1005 for non-movable allocations. The requested amount is
1006 1006 spread evenly throughout all nodes in the system. The
... ... @@ -1034,7 +1034,7 @@
1034 1034 Configure the RouterBoard 532 series on-chip
1035 1035 Ethernet adapter MAC address.
1036 1036  
1037   - kstack=N [X86-32,X86-64] Print N words from the kernel stack
  1037 + kstack=N [X86] Print N words from the kernel stack
1038 1038 in oops dumps.
1039 1039  
1040 1040 l2cr= [PPC]
... ... @@ -1044,7 +1044,7 @@
1044 1044 lapic [X86-32,APIC] Enable the local APIC even if BIOS
1045 1045 disabled it.
1046 1046  
1047   - lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer
  1047 + lapic_timer_c2_ok [X86,APIC] trust the local apic timer
1048 1048 in C2 power state.
1049 1049  
1050 1050 libata.dma= [LIBATA] DMA control
... ... @@ -1229,7 +1229,7 @@
1229 1229 [KNL,SH] Allow user to override the default size for
1230 1230 per-device physically contiguous DMA buffers.
1231 1231  
1232   - memmap=exactmap [KNL,X86-32,X86_64] Enable setting of an exact
  1232 + memmap=exactmap [KNL,X86] Enable setting of an exact
1233 1233 E820 memory map, as specified by the user.
1234 1234 Such memmap=exactmap lines can be constructed based on
1235 1235 BIOS output or other requirements. See the memmap=nn@ss
... ... @@ -1320,7 +1320,7 @@
1320 1320 mousedev.yres= [MOUSE] Vertical screen resolution, used for devices
1321 1321 reporting absolute coordinates, such as tablets
1322 1322  
1323   - movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter
  1323 + movablecore=nn[KMG] [KNL,X86,IA-64,PPC] This parameter
1324 1324 is similar to kernelcore except it specifies the
1325 1325 amount of memory used for migratable allocations.
1326 1326 If both kernelcore and movablecore is specified,
... ... @@ -1422,7 +1422,7 @@
1422 1422 when a NMI is triggered.
1423 1423 Format: [state][,regs][,debounce][,die]
1424 1424  
1425   - nmi_watchdog= [KNL,BUGS=X86-32,X86-64] Debugging features for SMP kernels
  1425 + nmi_watchdog= [KNL,BUGS=X86] Debugging features for SMP kernels
1426 1426 Format: [panic,][num]
1427 1427 Valid num: 0,1,2
1428 1428 0 - turn nmi_watchdog off
1429 1429  
... ... @@ -1475,11 +1475,11 @@
1475 1475  
1476 1476 nodsp [SH] Disable hardware DSP at boot time.
1477 1477  
1478   - noefi [X86-32,X86-64] Disable EFI runtime services support.
  1478 + noefi [X86] Disable EFI runtime services support.
1479 1479  
1480 1480 noexec [IA-64]
1481 1481  
1482   - noexec [X86-32,X86-64]
  1482 + noexec [X86]
1483 1483 On X86-32 available only on PAE configured kernels.
1484 1484 noexec=on: enable non-executable mappings (default)
1485 1485 noexec=off: disable non-executable mappings
... ... @@ -1525,7 +1525,7 @@
1525 1525 noirqdebug [X86-32] Disables the code which attempts to detect and
1526 1526 disable unhandled interrupt sources.
1527 1527  
1528   - no_timer_check [X86-32,X86_64,APIC] Disables the code which tests for
  1528 + no_timer_check [X86,APIC] Disables the code which tests for
1529 1529 broken timer IRQ sources.
1530 1530  
1531 1531 noisapnp [ISAPNP] Disables ISA PnP code.
... ... @@ -1689,7 +1689,7 @@
1689 1689 disable the use of PCIE advanced error reporting.
1690 1690 nodomains [PCI] Disable support for multiple PCI
1691 1691 root domains (aka PCI segments, in ACPI-speak).
1692   - nommconf [X86-32,X86_64] Disable use of MMCONFIG for PCI
  1692 + nommconf [X86] Disable use of MMCONFIG for PCI
1693 1693 Configuration
1694 1694 nomsi [MSI] If the PCI_MSI kernel config parameter is
1695 1695 enabled, this kernel boot option can be used to
... ... @@ -2380,7 +2380,7 @@
2380 2380 reported either.
2381 2381  
2382 2382 unknown_nmi_panic
2383   - [X86-32,X86-64]
  2383 + [X86]
2384 2384 Set unknown_nmi_panic=1 early on boot.
2385 2385  
2386 2386 usbcore.autosuspend=
2387 2387  
... ... @@ -2447,12 +2447,12 @@
2447 2447 medium is write-protected).
2448 2448 Example: quirks=0419:aaf5:rl,0421:0433:rc
2449 2449  
2450   - vdso= [X86-32,SH,x86-64]
  2450 + vdso= [X86,SH]
2451 2451 vdso=2: enable compat VDSO (default with COMPAT_VDSO)
2452 2452 vdso=1: enable VDSO (default)
2453 2453 vdso=0: disable VDSO mapping
2454 2454  
2455   - vdso32= [X86-32,X86-64]
  2455 + vdso32= [X86]
2456 2456 vdso32=2: enable compat VDSO (default with COMPAT_VDSO)
2457 2457 vdso32=1: enable 32-bit VDSO (default)
2458 2458 vdso32=0: disable 32-bit VDSO mapping