diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:39:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:39:23 -0800 |
| commit | 71ca44dac4cbf89ce88e460a293cc25c5b18fa50 (patch) | |
| tree | 199c54ee6ecfbdda0bf035df0257bbd278b97531 /include/asm-ia64/sal.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| parent | [IA64] fix ia64 kprobes compilation (diff) | |
| download | linux-dev-71ca44dac4cbf89ce88e460a293cc25c5b18fa50.tar.xz linux-dev-71ca44dac4cbf89ce88e460a293cc25c5b18fa50.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix ia64 kprobes compilation
[IA64] move gcc_intrin.h from header-y to unifdef-y
[IA64] workaround tiger ia64_sal_get_physical_id_info hang
[IA64] move defconfig to arch/ia64/configs/
[IA64] Fix irq migration in multiple vector domain
[IA64] signal(ia64_ia32): add a signal stack overflow check
[IA64] signal(ia64): add a signal stack overflow check
[IA64] CONFIG_SGI_SN2 - auto select NUMA and ACPI_NUMA
Diffstat (limited to 'include/asm-ia64/sal.h')
| -rw-r--r-- | include/asm-ia64/sal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h index 2251118894ae..f4904db3b057 100644 --- a/include/asm-ia64/sal.h +++ b/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; |