From ed68d288789af96b8b72eb1d80d5faf65bfa8c8a Mon Sep 17 00:00:00 2001
From: Jack Steiner <steiner@sgi.com>
Date: Mon, 16 Jun 2008 12:09:10 -0500
Subject: [PATCH] --- yaml --- r: 99833 b: refs/heads/master c:
 ab9c0bb8a8c1d71dd303abdaa61ec496128e2fbe h: refs/heads/master i:   99831:
 762ca6ed07fc8ab7bc7ee7646514c57be14ea94a v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-x86/mpspec_def.h | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 69dddc162eb8..58141b1ca390 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6df1b8bc1250191cfee15627697111c1cbda53f
+refs/heads/master: ab9c0bb8a8c1d71dd303abdaa61ec496128e2fbe
diff --git a/trunk/include/asm-x86/mpspec_def.h b/trunk/include/asm-x86/mpspec_def.h
index dc6ef85e3624..38d1e73b49e4 100644
--- a/trunk/include/asm-x86/mpspec_def.h
+++ b/trunk/include/asm-x86/mpspec_def.h
@@ -17,10 +17,11 @@
 # define MAX_MPC_ENTRY 1024
 # define MAX_APICS      256
 #else
-/*
- * A maximum of 255 APICs with the current APIC ID architecture.
- */
-# define MAX_APICS 255
+# if NR_CPUS <= 255
+#  define MAX_APICS     255
+# else
+#  define MAX_APICS   32768
+# endif
 #endif
 
 struct intel_mp_floating {