aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeidong Han <weidong.han@intel.com>2009-04-17 04:42:12 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-19 04:21:13 -0400
commit2b2fd87a6ef56ba7647a578e81bb8c8efda166b8 (patch)
treee0f950fdadbe7f4fc2d29f492a2a3c1a75e82edb
parent5043124e660fcc3ddefe4239ddfa017bf13f5081 (diff)
docs, x86: add nox2apic back to kernel-parameters.txt
"nox2apic" was removed from kernel-parameters.txt by mistake, when entries were sorted in alpha order (commit 0cb55ad2). But this early parameter is still there, add it back to kernel-parameters.txt. [ Impact: add boot parameter description ] Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Weidong Han <weidong.han@intel.com> Acked-by: David Woodhouse <David.Woodhouse@intel.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: iommu@lists.linux-foundation.org Cc: allen.m.kay@intel.com Cc: fenghua.yu@intel.com LKML-Reference: <1239957736-6161-2-git-send-email-weidong.han@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 6172e4360f60..33989d284ff0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1588,6 +1588,8 @@ and is between 256 and 4096 characters. It is defined in the file
1588 1588
1589 nowb [ARM] 1589 nowb [ARM]
1590 1590
1591 nox2apic [X86-64,APIC] Do not enable x2APIC mode.
1592
1591 nptcg= [IA64] Override max number of concurrent global TLB 1593 nptcg= [IA64] Override max number of concurrent global TLB
1592 purges which is reported from either PAL_VM_SUMMARY or 1594 purges which is reported from either PAL_VM_SUMMARY or
1593 SAL PALO. 1595 SAL PALO.