[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-2b2fd87a6ef56ba7647a578e81bb8c8efda166b8@git.kernel.org>
Date: Sun, 19 Apr 2009 08:24:53 GMT
From: tip-bot for Weidong Han <weidong.han@...el.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
weidong.han@...el.com, randy.dunlap@...cle.com,
suresh.b.siddha@...el.com, tglx@...utronix.de, mingo@...e.hu,
David.Woodhouse@...el.com
Subject: [tip:x86/apic] docs, x86: add nox2apic back to kernel-parameters.txt
Commit-ID: 2b2fd87a6ef56ba7647a578e81bb8c8efda166b8
Gitweb: http://git.kernel.org/tip/2b2fd87a6ef56ba7647a578e81bb8c8efda166b8
Author: Weidong Han <weidong.han@...el.com>
AuthorDate: Fri, 17 Apr 2009 16:42:12 +0800
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sun, 19 Apr 2009 10:21:13 +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@...el.com>
Signed-off-by: Weidong Han <weidong.han@...el.com>
Acked-by: David Woodhouse <David.Woodhouse@...el.com>
Cc: Randy Dunlap <randy.dunlap@...cle.com>
Cc: iommu@...ts.linux-foundation.org
Cc: allen.m.kay@...el.com
Cc: fenghua.yu@...el.com
LKML-Reference: <1239957736-6161-2-git-send-email-weidong.han@...el.com>
Signed-off-by: Ingo Molnar <mingo@...e.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 6172e43..33989d2 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists