Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756198AbZDRHcY (ORCPT ); Sat, 18 Apr 2009 03:32:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752103AbZDRHcP (ORCPT ); Sat, 18 Apr 2009 03:32:15 -0400 Received: from hera.kernel.org ([140.211.167.34]:52715 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751502AbZDRHcO (ORCPT ); Sat, 18 Apr 2009 03:32:14 -0400 Date: Sat, 18 Apr 2009 07:31:24 GMT From: tip-bot for Weidong Han To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, suresh.b.siddha@intel.com, weidong.han@intel.com, tglx@linutronix.de, randy.dunlap@oracle.com, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, weidong.han@intel.com, suresh.b.siddha@intel.com, tglx@linutronix.de, randy.dunlap@oracle.com, mingo@elte.hu In-Reply-To: <1239957736-6161-2-git-send-email-weidong.han@intel.com> References: <1239957736-6161-2-git-send-email-weidong.han@intel.com> Subject: [tip:x86/urgent] docs, x86: add nox2apic back to kernel-parameters.txt Message-ID: Git-Commit-ID: 8b5b94e4e9813cdd77103827f48d58c806ab45c6 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Sat, 18 Apr 2009 07:31:26 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1833 Lines: 48 Commit-ID: 8b5b94e4e9813cdd77103827f48d58c806ab45c6 Gitweb: http://git.kernel.org/tip/8b5b94e4e9813cdd77103827f48d58c806ab45c6 Author: Weidong Han AuthorDate: Fri, 17 Apr 2009 16:42:12 +0800 Committer: Ingo Molnar 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 Signed-off-by: Weidong Han Cc: Randy Dunlap 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 --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/