diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 09:55:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 09:55:28 -0800 |
| commit | 59af70385fb125f819d953801b6c45629836e916 (patch) | |
| tree | 6232fb052167c7cbd51851323088217617dbde42 /include/asm-ia64/sn/sn_sal.h | |
| parent | e7de369050534025b33aab1033358bf47a577e4d (diff) | |
| parent | d50f5c5ca0c3426669fbe11ad4d5708d333eb9fb (diff) | |
| download | op-kernel-dev-59af70385fb125f819d953801b6c45629836e916.zip op-kernel-dev-59af70385fb125f819d953801b6c45629836e916.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/sn/sn_sal.h')
| -rw-r--r-- | include/asm-ia64/sn/sn_sal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h index 2a8b0d9..8b9e10e 100644 --- a/include/asm-ia64/sn/sn_sal.h +++ b/include/asm-ia64/sn/sn_sal.h @@ -75,7 +75,8 @@ #define SN_SAL_IOIF_GET_HUBDEV_INFO 0x02000055 #define SN_SAL_IOIF_GET_PCIBUS_INFO 0x02000056 #define SN_SAL_IOIF_GET_PCIDEV_INFO 0x02000057 -#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 +#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 // deprecated +#define SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST 0x0200005a #define SN_SAL_HUB_ERROR_INTERRUPT 0x02000060 #define SN_SAL_BTE_RECOVER 0x02000061 @@ -1100,7 +1101,7 @@ ia64_sn_bte_recovery(nasid_t nasid) struct ia64_sal_retval rv; rv.status = 0; - SAL_CALL_NOLOCK(rv, SN_SAL_BTE_RECOVER, 0, 0, 0, 0, 0, 0, 0); + SAL_CALL_NOLOCK(rv, SN_SAL_BTE_RECOVER, (u64)nasid, 0, 0, 0, 0, 0, 0); if (rv.status == SALRET_NOT_IMPLEMENTED) return 0; return (int) rv.status; |
