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

Download as
Browse Code ยป

Commit cd4f0ef7c03e79f92a883843662e3d0eaae26fb4

Authored by Alan Cox
Committed by Linus Torvalds
1 parent f6f953aa99
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

doc/kernel-parameters: use X86-32 tag instead of IA-32 

Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

Documentation/kernel-parameters.txt
Diff comments   View file @ cd4f0ef
... ... @@ -41,7 +41,6 @@
41 41 EIDE EIDE/ATAPI support is enabled.
42 42 FB The frame buffer device is enabled.
43 43 HW Appropriate hardware is enabled.
44   - IA-32 IA-32 aka i386 architecture is enabled.
45 44 IA-64 IA-64 architecture is enabled.
46 45 IOSCHED More than one I/O scheduler is enabled.
47 46 IP_PNP IP DHCP, BOOTP, or RARP is enabled.
... ... @@ -92,6 +91,7 @@
92 91 VT Virtual terminal support is enabled.
93 92 WDT Watchdog support is enabled.
94 93 XT IBM PC/XT MFM hard disk support is enabled.
  94 + X86-32 X86-32, aka i386 architecture is enabled.
95 95 X86-64 X86-64 architecture is enabled.
96 96 More X86-64 boot options can be found in
97 97 Documentation/x86_64/boot-options.txt .
... ... @@ -219,7 +219,7 @@
219 219  
220 220 acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT
221 221  
222   - acpi_pm_good [IA-32,X86-64]
  222 + acpi_pm_good [X86-32,X86-64]
223 223 Override the pmtimer bug detection: force the kernel
224 224 to assume that this machine's pmtimer latches its value
225 225 and always returns good values.
... ... @@ -357,7 +357,7 @@
357 357  
358 358 c101= [NET] Moxa C101 synchronous serial card
359 359  
360   - cachesize= [BUGS=IA-32] Override level 2 CPU cache size detection.
  360 + cachesize= [BUGS=X86-32] Override level 2 CPU cache size detection.
361 361 Sometimes CPU hardware bugs make them report the cache
362 362 size incorrectly. The kernel will attempt work arounds
363 363 to fix known problems, but for some CPUs it is not
... ... @@ -376,7 +376,7 @@
376 376 Value can be changed at runtime via
377 377 /selinux/checkreqprot.
378 378  
379   - clock= [BUGS=IA-32, HW] gettimeofday clocksource override.
  379 + clock= [BUGS=X86-32, HW] gettimeofday clocksource override.
380 380 [Deprecated]
381 381 Forces specified clocksource (if available) to be used
382 382 when calculating gettimeofday(). If specified
... ... @@ -394,7 +394,7 @@
394 394 [ARM] imx_timer1,OSTS,netx_timer,mpu_timer2,
395 395 pxa_timer,timer3,32k_counter,timer0_1
396 396 [AVR32] avr32
397   - [IA-32] pit,hpet,tsc,vmi-timer;
  397 + [X86-32] pit,hpet,tsc,vmi-timer;
398 398 scx200_hrt on Geode; cyclone on IBM x440
399 399 [MIPS] MIPS
400 400 [PARISC] cr16
... ... @@ -414,7 +414,7 @@
414 414 over the 8254 in addition to over the IO-APIC. The
415 415 kernel tries to set a sensible default.
416 416  
417   - hpet= [IA-32,HPET] option to disable HPET and use PIT.
  417 + hpet= [X86-32,HPET] option to disable HPET and use PIT.
418 418 Format: disable
419 419  
420 420 com20020= [HW,NET] ARCnet - COM20020 chipset
... ... @@ -551,7 +551,7 @@
551 551  
552 552 dtc3181e= [HW,SCSI]
553 553  
554   - earlyprintk= [IA-32,X86-64,SH]
  554 + earlyprintk= [X86-32,X86-64,SH]
555 555 earlyprintk=vga
556 556 earlyprintk=serial[,ttySn[,baudrate]]
557 557  
... ... @@ -589,7 +589,7 @@
589 589 eisa_irq_edge= [PARISC,HW]
590 590 See header of drivers/parisc/eisa.c.
591 591  
592   - elanfreq= [IA-32]
  592 + elanfreq= [X86-32]
593 593 See comment before function elanfreq_setup() in
594 594 arch/i386/kernel/cpu/cpufreq/elanfreq.c.
595 595  
... ... @@ -598,7 +598,7 @@
598 598 See Documentation/block/as-iosched.txt and
599 599 Documentation/block/deadline-iosched.txt for details.
600 600  
601   - elfcorehdr= [IA-32, X86_64]
  601 + elfcorehdr= [X86-32, X86_64]
602 602 Specifies physical address of start of kernel core
603 603 image elf header. Generally kexec loader will
604 604 pass this option to capture kernel.
... ... @@ -680,7 +680,7 @@
680 680 hisax= [HW,ISDN]
681 681 See Documentation/isdn/README.HiSax.
682 682  
683   - hugepages= [HW,IA-32,IA-64] Maximal number of HugeTLB pages.
  683 + hugepages= [HW,X86-32,IA-64] Maximal number of HugeTLB pages.
684 684  
685 685 i8042.direct [HW] Put keyboard port into non-translated mode
686 686 i8042.dumbkbd [HW] Pretend that controller can only read data from
... ... @@ -822,7 +822,7 @@
822 822 js= [HW,JOY] Analog joystick
823 823 See Documentation/input/joystick.txt.
824 824  
825   - kernelcore=nn[KMG] [KNL,IA-32,IA-64,PPC,X86-64] This parameter
  825 + kernelcore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter
826 826 specifies the amount of memory usable by the kernel
827 827 for non-movable allocations. The requested amount is
828 828 spread evenly throughout all nodes in the system. The
... ... @@ -838,7 +838,7 @@
838 838 use the HighMem zone if it exists, and the Normal
839 839 zone if it does not.
840 840  
841   - movablecore=nn[KMG] [KNL,IA-32,IA-64,PPC,X86-64] This parameter
  841 + movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter
842 842 is similar to kernelcore except it specifies the
843 843 amount of memory used for migratable allocations.
844 844 If both kernelcore and movablecore is specified,
845 845  
846 846  
847 847  
... ... @@ -850,21 +850,21 @@
850 850  
851 851 keepinitrd [HW,ARM]
852 852  
853   - kstack=N [IA-32,X86-64] Print N words from the kernel stack
  853 + kstack=N [X86-32,X86-64] Print N words from the kernel stack
854 854 in oops dumps.
855 855  
856 856 l2cr= [PPC]
857 857  
858   - lapic [IA-32,APIC] Enable the local APIC even if BIOS
  858 + lapic [X86-32,APIC] Enable the local APIC even if BIOS
859 859 disabled it.
860 860  
861   - lapic_timer_c2_ok [IA-32,x86-64,APIC] trust the local apic timer in
  861 + lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer in
862 862 C2 power state.
863 863  
864 864 lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip
865 865 Format: addr:<io>,irq:<irq>
866 866  
867   - legacy_serial.force [HW,IA-32,X86-64]
  867 + legacy_serial.force [HW,X86-32,X86-64]
868 868 Probe for COM ports at legacy addresses even
869 869 if PNPBIOS or ACPI should describe them. This
870 870 is for working around firmware defects.
871 871  
... ... @@ -974,11 +974,11 @@
974 974 [SCSI] Maximum number of LUNs received.
975 975 Should be between 1 and 16384.
976 976  
977   - mca-pentium [BUGS=IA-32]
  977 + mca-pentium [BUGS=X86-32]
978 978  
979 979 mcatest= [IA-64]
980 980  
981   - mce [IA-32] Machine Check Exception
  981 + mce [X86-32] Machine Check Exception
982 982  
983 983 md= [HW] RAID subsystems devices and level
984 984 See Documentation/md.txt.
985 985  
986 986  
... ... @@ -990,14 +990,14 @@
990 990 mem=nn[KMG] [KNL,BOOT] Force usage of a specific amount of memory
991 991 Amount of memory to be used when the kernel is not able
992 992 to see the whole system memory or for test.
993   - [IA-32] Use together with memmap= to avoid physical
  993 + [X86-32] Use together with memmap= to avoid physical
994 994 address space collisions. Without memmap= PCI devices
995 995 could be placed at addresses belonging to unused RAM.
996 996  
997   - mem=nopentium [BUGS=IA-32] Disable usage of 4MB pages for kernel
  997 + mem=nopentium [BUGS=X86-32] Disable usage of 4MB pages for kernel
998 998 memory.
999 999  
1000   - memmap=exactmap [KNL,IA-32,X86_64] Enable setting of an exact
  1000 + memmap=exactmap [KNL,X86-32,X86_64] Enable setting of an exact
1001 1001 E820 memory map, as specified by the user.
1002 1002 Such memmap=exactmap lines can be constructed based on
1003 1003 BIOS output or other requirements. See the memmap=nn@ss
1004 1004  
... ... @@ -1083,9 +1083,9 @@
1083 1083 [NFS] set the maximum lifetime for idmapper cache
1084 1084 entries.
1085 1085  
1086   - nmi_watchdog= [KNL,BUGS=IA-32] Debugging features for SMP kernels
  1086 + nmi_watchdog= [KNL,BUGS=X86-32] Debugging features for SMP kernels
1087 1087  
1088   - no387 [BUGS=IA-32] Tells the kernel to use the 387 maths
  1088 + no387 [BUGS=X86-32] Tells the kernel to use the 387 maths
1089 1089 emulation library even if a 387 maths coprocessor
1090 1090 is present.
1091 1091  
1092 1092  
1093 1093  
... ... @@ -1116,17 +1116,17 @@
1116 1116  
1117 1117 noexec [IA-64]
1118 1118  
1119   - noexec [IA-32,X86-64]
  1119 + noexec [X86-32,X86-64]
1120 1120 noexec=on: enable non-executable mappings (default)
1121 1121 noexec=off: disable nn-executable mappings
1122 1122  
1123   - nofxsr [BUGS=IA-32] Disables x86 floating point extended
  1123 + nofxsr [BUGS=X86-32] Disables x86 floating point extended
1124 1124 register save and restore. The kernel will only save
1125 1125 legacy floating-point registers on task switch.
1126 1126  
1127 1127 nohlt [BUGS=ARM]
1128 1128  
1129   - no-hlt [BUGS=IA-32] Tells the kernel that the hlt
  1129 + no-hlt [BUGS=X86-32] Tells the kernel that the hlt
1130 1130 instruction doesn't work correctly and not to
1131 1131 use it.
1132 1132  
1133 1133  
1134 1134  
... ... @@ -1141,12 +1141,12 @@
1141 1141 Valid arguments: on, off
1142 1142 Default: on
1143 1143  
1144   - noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing
  1144 + noirqbalance [X86-32,SMP,KNL] Disable kernel irq balancing
1145 1145  
1146   - noirqdebug [IA-32] Disables the code which attempts to detect and
  1146 + noirqdebug [X86-32] Disables the code which attempts to detect and
1147 1147 disable unhandled interrupt sources.
1148 1148  
1149   - no_timer_check [IA-32,X86_64,APIC] Disables the code which tests for
  1149 + no_timer_check [X86-32,X86_64,APIC] Disables the code which tests for
1150 1150 broken timer IRQ sources.
1151 1151  
1152 1152 noisapnp [ISAPNP] Disables ISA PnP code.
1153 1153  
1154 1154  
1155 1155  
1156 1156  
... ... @@ -1158,20 +1158,20 @@
1158 1158  
1159 1159 nojitter [IA64] Disables jitter checking for ITC timers.
1160 1160  
1161   - nolapic [IA-32,APIC] Do not enable or use the local APIC.
  1161 + nolapic [X86-32,APIC] Do not enable or use the local APIC.
1162 1162  
1163   - nolapic_timer [IA-32,APIC] Do not use the local APIC timer.
  1163 + nolapic_timer [X86-32,APIC] Do not use the local APIC timer.
1164 1164  
1165 1165 noltlbs [PPC] Do not use large page/tlb entries for kernel
1166 1166 lowmem mapping on PPC40x.
1167 1167  
1168 1168 nomca [IA-64] Disable machine check abort handling
1169 1169  
1170   - nomce [IA-32] Machine Check Exception
  1170 + nomce [X86-32] Machine Check Exception
1171 1171  
1172   - noreplace-paravirt [IA-32,PV_OPS] Don't patch paravirt_ops
  1172 + noreplace-paravirt [X86-32,PV_OPS] Don't patch paravirt_ops
1173 1173  
1174   - noreplace-smp [IA-32,SMP] Don't replace SMP instructions
  1174 + noreplace-smp [X86-32,SMP] Don't replace SMP instructions
1175 1175 with UP alternatives
1176 1176  
1177 1177 noresidual [PPC] Don't use residual data on PReP machines.
... ... @@ -1185,7 +1185,7 @@
1185 1185  
1186 1186 nosbagart [IA-64]
1187 1187  
1188   - nosep [BUGS=IA-32] Disables x86 SYSENTER/SYSEXIT support.
  1188 + nosep [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support.
1189 1189  
1190 1190 nosmp [SMP] Tells an SMP kernel to act as a UP kernel.
1191 1191  
... ... @@ -1193,7 +1193,7 @@
1193 1193  
1194 1194 nosync [HW,M68K] Disables sync negotiation for all devices.
1195 1195  
1196   - notsc [BUGS=IA-32] Disable Time Stamp Counter
  1196 + notsc [BUGS=X86-32] Disable Time Stamp Counter
1197 1197  
1198 1198 nousb [USB] Disable the USB subsystem
1199 1199  
1200 1200  
1201 1201  
1202 1202  
1203 1203  
1204 1204  
1205 1205  
... ... @@ -1266,28 +1266,28 @@
1266 1266 See also Documentation/paride.txt.
1267 1267  
1268 1268 pci=option[,option...] [PCI] various PCI subsystem options:
1269   - off [IA-32] don't probe for the PCI bus
1270   - bios [IA-32] force use of PCI BIOS, don't access
  1269 + off [X86-32] don't probe for the PCI bus
  1270 + bios [X86-32] force use of PCI BIOS, don't access
1271 1271 the hardware directly. Use this if your machine
1272 1272 has a non-standard PCI host bridge.
1273   - nobios [IA-32] disallow use of PCI BIOS, only direct
  1273 + nobios [X86-32] disallow use of PCI BIOS, only direct
1274 1274 hardware access methods are allowed. Use this
1275 1275 if you experience crashes upon bootup and you
1276 1276 suspect they are caused by the BIOS.
1277   - conf1 [IA-32] Force use of PCI Configuration
  1277 + conf1 [X86-32] Force use of PCI Configuration
1278 1278 Mechanism 1.
1279   - conf2 [IA-32] Force use of PCI Configuration
  1279 + conf2 [X86-32] Force use of PCI Configuration
1280 1280 Mechanism 2.
1281   - nommconf [IA-32,X86_64] Disable use of MMCONFIG for PCI
  1281 + nommconf [X86-32,X86_64] Disable use of MMCONFIG for PCI
1282 1282 Configuration
1283 1283 nomsi [MSI] If the PCI_MSI kernel config parameter is
1284 1284 enabled, this kernel boot option can be used to
1285 1285 disable the use of MSI interrupts system-wide.
1286   - nosort [IA-32] Don't sort PCI devices according to
  1286 + nosort [X86-32] Don't sort PCI devices according to
1287 1287 order given by the PCI BIOS. This sorting is
1288 1288 done to get a device order compatible with
1289 1289 older kernels.
1290   - biosirq [IA-32] Use PCI BIOS calls to get the interrupt
  1290 + biosirq [X86-32] Use PCI BIOS calls to get the interrupt
1291 1291 routing table. These calls are known to be buggy
1292 1292 on several machines and they hang the machine
1293 1293 when used, but on other computers it's the only
1294 1294  
1295 1295  
1296 1296  
1297 1297  
1298 1298  
1299 1299  
... ... @@ -1295,32 +1295,32 @@
1295 1295 this option if the kernel is unable to allocate
1296 1296 IRQs or discover secondary PCI buses on your
1297 1297 motherboard.
1298   - rom [IA-32] Assign address space to expansion ROMs.
  1298 + rom [X86-32] Assign address space to expansion ROMs.
1299 1299 Use with caution as certain devices share
1300 1300 address decoders between ROMs and other
1301 1301 resources.
1302   - irqmask=0xMMMM [IA-32] Set a bit mask of IRQs allowed to be
  1302 + irqmask=0xMMMM [X86-32] Set a bit mask of IRQs allowed to be
1303 1303 assigned automatically to PCI devices. You can
1304 1304 make the kernel exclude IRQs of your ISA cards
1305 1305 this way.
1306   - pirqaddr=0xAAAAA [IA-32] Specify the physical address
  1306 + pirqaddr=0xAAAAA [X86-32] Specify the physical address
1307 1307 of the PIRQ table (normally generated
1308 1308 by the BIOS) if it is outside the
1309 1309 F0000h-100000h range.
1310   - lastbus=N [IA-32] Scan all buses thru bus #N. Can be
  1310 + lastbus=N [X86-32] Scan all buses thru bus #N. Can be
1311 1311 useful if the kernel is unable to find your
1312 1312 secondary buses and you want to tell it
1313 1313 explicitly which ones they are.
1314   - assign-busses [IA-32] Always assign all PCI bus
  1314 + assign-busses [X86-32] Always assign all PCI bus
1315 1315 numbers ourselves, overriding
1316 1316 whatever the firmware may have done.
1317   - usepirqmask [IA-32] Honor the possible IRQ mask stored
  1317 + usepirqmask [X86-32] Honor the possible IRQ mask stored
1318 1318 in the BIOS $PIR table. This is needed on
1319 1319 some systems with broken BIOSes, notably
1320 1320 some HP Pavilion N5400 and Omnibook XE3
1321 1321 notebooks. This will have no effect if ACPI
1322 1322 IRQ routing is enabled.
1323   - noacpi [IA-32] Do not use ACPI for IRQ routing
  1323 + noacpi [X86-32] Do not use ACPI for IRQ routing
1324 1324 or for PCI scanning.
1325 1325 routeirq Do IRQ routing for all PCI devices.
1326 1326 This is normally done in pci_enable_device(),
1327 1327  
... ... @@ -1469,13 +1469,13 @@
1469 1469 Run specified binary instead of /init from the ramdisk,
1470 1470 used for early userspace startup. See initrd.
1471 1471  
1472   - reboot= [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
  1472 + reboot= [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
1473 1473 Format: <reboot_mode>[,<reboot_mode2>[,...]]
1474 1474 See arch/*/kernel/reboot.c or arch/*/kernel/process.c
1475 1475  
1476 1476 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area
1477 1477  
1478   - reservetop= [IA-32]
  1478 + reservetop= [X86-32]
1479 1479 Format: nn[KMG]
1480 1480 Reserves a hole at the top of the kernel virtual
1481 1481 address space.
... ... @@ -1566,7 +1566,7 @@
1566 1566 Value can be changed at runtime via
1567 1567 /selinux/compat_net.
1568 1568  
1569   - serialnumber [BUGS=IA-32]
  1569 + serialnumber [BUGS=X86-32]
1570 1570  
1571 1571 sg_def_reserved_size= [SCSI]
1572 1572  
... ... @@ -1619,7 +1619,7 @@
1619 1619 smart2= [HW]
1620 1620 Format: <io1>[,<io2>[,...,<io8>]]
1621 1621  
1622   - smp-alt-once [IA-32,SMP] On a hotplug CPU system, only
  1622 + smp-alt-once [X86-32,SMP] On a hotplug CPU system, only
1623 1623 attempt to substitute SMP alternatives once at boot.
1624 1624  
1625 1625 smsc-ircc2.nopnp [HW] Don't use PNP to discover SMC devices
... ... @@ -1884,7 +1884,7 @@
1884 1884 usbhid.mousepoll=
1885 1885 [USBHID] The interval which mice are to be polled at.
1886 1886  
1887   - vdso= [IA-32,SH,x86-64]
  1887 + vdso= [X86-32,SH,x86-64]
1888 1888 vdso=2: enable compat VDSO (default with COMPAT_VDSO)
1889 1889 vdso=1: enable VDSO (default)
1890 1890 vdso=0: disable VDSO mapping
... ... @@ -1895,7 +1895,7 @@
1895 1895 video= [FB] Frame buffer configuration
1896 1896 See Documentation/fb/modedb.txt.
1897 1897  
1898   - vga= [BOOT,IA-32] Select a particular video mode
  1898 + vga= [BOOT,X86-32] Select a particular video mode
1899 1899 See Documentation/i386/boot.txt and
1900 1900 Documentation/svga.txt.
1901 1901 Use vga=ask for menu.