]> err.no Git - linux-2.6/commit
[IA64] workaround tiger ia64_sal_get_physical_id_info hang
authorAlex Chiang <achiang@hp.com>
Thu, 28 Feb 2008 01:41:38 +0000 (18:41 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 4 Mar 2008 22:26:50 +0000 (14:26 -0800)
commit6ed0dc5ba811ce682f48988bf114669265e1120d
treed5a2dfdd7d183634899e72021a9a981838e3a771
parent022f9268854e88adcc343de77a440d6e82f74c2e
[IA64] workaround tiger ia64_sal_get_physical_id_info hang

This fixes regression introduced in 113134fcbca83619be4c68d0ca66db6093777b5d

Intel Tiger platforms hang when calling SAL_GET_PHYSICAL_ID_INFO
instead of properly returning -1 for unimplemented, so add a
version check.

SGI Altix platforms have an incorrect SAL version hard-coded into
their prom -- they encode 2.9, but actually implement 3.2 -- so
fix it up and allow ia64_sal_get_physical_id_info to keep
working.

Signed-off-by: Alex Chiang <achiang@hp.com>
Acked-by: Russ Anderson <rja@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/sal.c
include/asm-ia64/sal.h