[tip:x86/urgent] docs, x86: add nox2apic back to kernel-parameters.txt

[tip-bot for Weidong Han]

Commit-ID:  8b5b94e4e9813cdd77103827f48d58c806ab45c6
Gitweb:     http://git.kernel.org/tip/8b5b94e4e9813cdd77103827f48d58c806ab45c6
Author:     Weidong Han <weidong.han@xxxxxxxxx>
AuthorDate: Fri, 17 Apr 2009 16:42:12 +0800
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sat, 18 Apr 2009 09:29:16 +0200

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@xxxxxxxxx>
Signed-off-by: Weidong Han <weidong.han@xxxxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: iommu@xxxxxxxxxxxxxxxxxxxxxxxxxx
Cc: dwmw2@xxxxxxxxxxxxx
Cc: allen.m.kay@xxxxxxxxx
Cc: fenghua.yu@xxxxxxxxx
LKML-Reference: <1239957736-6161-2-git-send-email-weidong.han@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
 Documentation/kernel-parameters.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a19f021..9e4fe72 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
 
 	nowb		[ARM]
 
+	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.
+
 	nptcg=		[IA64] Override max number of concurrent global TLB
 			purges which is reported from either PAL_VM_SUMMARY or
 			SAL PALO.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/