Messages in this thread Patch in this message | | | Date | Sat, 18 Apr 2009 07:31:24 GMT | From | tip-bot for Weidong Han <> | Subject | [tip:x86/urgent] docs, x86: add nox2apic back to kernel-parameters.txt |
| |
Commit-ID: 8b5b94e4e9813cdd77103827f48d58c806ab45c6 Gitweb: http://git.kernel.org/tip/8b5b94e4e9813cdd77103827f48d58c806ab45c6 Author: Weidong Han <weidong.han@intel.com> AuthorDate: Fri, 17 Apr 2009 16:42:12 +0800 Committer: Ingo Molnar <mingo@elte.hu> 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@intel.com> Signed-off-by: Weidong Han <weidong.han@intel.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: iommu@lists.linux-foundation.org Cc: dwmw2@infradead.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>
--- 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.
| |