From 44e8b6c3e55099efdaefccc06e7d81466ad1567c Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Wed, 27 Feb 2008 18:41:38 -0700
Subject: [PATCH] --- yaml --- r: 86888 b: refs/heads/master c:
 6ed0dc5ba811ce682f48988bf114669265e1120d h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/ia64/kernel/sal.c | 7 +++++++
 trunk/include/asm-ia64/sal.h | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d52ac1e5228..505262ee9432 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 022f9268854e88adcc343de77a440d6e82f74c2e
+refs/heads/master: 6ed0dc5ba811ce682f48988bf114669265e1120d
diff --git a/trunk/arch/ia64/kernel/sal.c b/trunk/arch/ia64/kernel/sal.c
index f44fe8412162..a3022dc48ef8 100644
--- a/trunk/arch/ia64/kernel/sal.c
+++ b/trunk/arch/ia64/kernel/sal.c
@@ -109,6 +109,13 @@ check_versions (struct ia64_sal_systab *systab)
 		sal_revision = SAL_VERSION_CODE(2, 8);
 		sal_version = SAL_VERSION_CODE(0, 0);
 	}
+
+	if (ia64_platform_is("sn2") && (sal_revision == SAL_VERSION_CODE(2, 9)))
+		/*
+		 * SGI Altix has hard-coded version 2.9 in their prom
+		 * but they actually implement 3.2, so let's fix it here.
+		 */
+		sal_revision = SAL_VERSION_CODE(3, 2);
 }
 
 static void __init
diff --git a/trunk/include/asm-ia64/sal.h b/trunk/include/asm-ia64/sal.h
index 2251118894ae..f4904db3b057 100644
--- a/trunk/include/asm-ia64/sal.h
+++ b/trunk/include/asm-ia64/sal.h
@@ -807,6 +807,10 @@ static inline s64
 ia64_sal_physical_id_info(u16 *splid)
 {
 	struct ia64_sal_retval isrv;
+
+	if (sal_revision < SAL_VERSION_CODE(3,2))
+		return -1;
+
 	SAL_CALL(isrv, SAL_PHYSICAL_ID_INFO, 0, 0, 0, 0, 0, 0, 0);
 	if (splid)
 		*splid = isrv.v0;