From 8924015baee9c0b96be632d5afdf81898ffe1517 Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Fri, 11 Jul 2008 13:11:57 -0700
Subject: [PATCH] --- yaml --- r: 112664 b: refs/heads/master c:
 af9d13887f9e3699bbc852c39b076d30bb9dff2f h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/kernel-parameters.txt | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a02c47a0f26a..c576fff084f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad66dd340f561bdde2285992314d9e4fd9b6191e
+refs/heads/master: af9d13887f9e3699bbc852c39b076d30bb9dff2f
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 56689ef1a159..88b08acf2ff2 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -1379,6 +1379,10 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.
 
+	x2apic_phys	[X86-64,APIC] Use x2apic physical mode instead of
+			default x2apic cluster mode on platforms
+			supporting x2apic.
+
 	noltlbs		[PPC] Do not use large page/tlb entries for kernel
 			lowmem mapping on PPC40x.