diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 15:50:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 15:50:59 -0400 |
commit | 8bd93ca7b03f38a7bc1a4ed9e93e8c006e753d5b (patch) | |
tree | 308bb026df1360d8708d53ebd4421719b470b2fb /Documentation/kernel-parameters.txt | |
parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
parent | 87c6f40128f92621698f97a62d2ead5184d1dd97 (diff) |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, gart: fix gart detection for Fam11h CPUs
x86: 64 bit print out absent pages num too
x86, kdump: fix invalid access on i386 sparsemem
x86: fix APIC_DEBUG with inquire_remote_apic
x86: AMD microcode patch loader author update
x86: microcode patch loader author update
mailmap: add Peter Oruba
x86, bts: improve help text for BTS config
doc/x86: fix doc subdirs
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 343e0f0f84b6..1bbcaa8982b6 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -100,7 +100,7 @@ parameter is applicable: | |||
100 | X86-32 X86-32, aka i386 architecture is enabled. | 100 | X86-32 X86-32, aka i386 architecture is enabled. |
101 | X86-64 X86-64 architecture is enabled. | 101 | X86-64 X86-64 architecture is enabled. |
102 | More X86-64 boot options can be found in | 102 | More X86-64 boot options can be found in |
103 | Documentation/x86_64/boot-options.txt . | 103 | Documentation/x86/x86_64/boot-options.txt . |
104 | X86 Either 32bit or 64bit x86 (same as X86-32+X86-64) | 104 | X86 Either 32bit or 64bit x86 (same as X86-32+X86-64) |
105 | 105 | ||
106 | In addition, the following text indicates that the option: | 106 | In addition, the following text indicates that the option: |
@@ -112,10 +112,10 @@ In addition, the following text indicates that the option: | |||
112 | Parameters denoted with BOOT are actually interpreted by the boot | 112 | Parameters denoted with BOOT are actually interpreted by the boot |
113 | loader, and have no meaning to the kernel directly. | 113 | loader, and have no meaning to the kernel directly. |
114 | Do not modify the syntax of boot loader parameters without extreme | 114 | Do not modify the syntax of boot loader parameters without extreme |
115 | need or coordination with <Documentation/i386/boot.txt>. | 115 | need or coordination with <Documentation/x86/i386/boot.txt>. |
116 | 116 | ||
117 | There are also arch-specific kernel-parameters not documented here. | 117 | There are also arch-specific kernel-parameters not documented here. |
118 | See for example <Documentation/x86_64/boot-options.txt>. | 118 | See for example <Documentation/x86/x86_64/boot-options.txt>. |
119 | 119 | ||
120 | Note that ALL kernel parameters listed below are CASE SENSITIVE, and that | 120 | Note that ALL kernel parameters listed below are CASE SENSITIVE, and that |
121 | a trailing = on the name of any parameter states that that parameter will | 121 | a trailing = on the name of any parameter states that that parameter will |
@@ -1222,7 +1222,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1222 | 1222 | ||
1223 | mce [X86-32] Machine Check Exception | 1223 | mce [X86-32] Machine Check Exception |
1224 | 1224 | ||
1225 | mce=option [X86-64] See Documentation/x86_64/boot-options.txt | 1225 | mce=option [X86-64] See Documentation/x86/x86_64/boot-options.txt |
1226 | 1226 | ||
1227 | md= [HW] RAID subsystems devices and level | 1227 | md= [HW] RAID subsystems devices and level |
1228 | See Documentation/md.txt. | 1228 | See Documentation/md.txt. |
@@ -1728,7 +1728,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1728 | See Documentation/paride.txt. | 1728 | See Documentation/paride.txt. |
1729 | 1729 | ||
1730 | pirq= [SMP,APIC] Manual mp-table setup | 1730 | pirq= [SMP,APIC] Manual mp-table setup |
1731 | See Documentation/i386/IO-APIC.txt. | 1731 | See Documentation/x86/i386/IO-APIC.txt. |
1732 | 1732 | ||
1733 | plip= [PPT,NET] Parallel port network link | 1733 | plip= [PPT,NET] Parallel port network link |
1734 | Format: { parport<nr> | timid | 0 } | 1734 | Format: { parport<nr> | timid | 0 } |
@@ -2343,7 +2343,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2343 | See Documentation/fb/modedb.txt. | 2343 | See Documentation/fb/modedb.txt. |
2344 | 2344 | ||
2345 | vga= [BOOT,X86-32] Select a particular video mode | 2345 | vga= [BOOT,X86-32] Select a particular video mode |
2346 | See Documentation/i386/boot.txt and | 2346 | See Documentation/x86/i386/boot.txt and |
2347 | Documentation/svga.txt. | 2347 | Documentation/svga.txt. |
2348 | Use vga=ask for menu. | 2348 | Use vga=ask for menu. |
2349 | This is actually a boot loader parameter; the value is | 2349 | This is actually a boot loader parameter; the value is |