Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for...

[cascardo/linux.git] / arch / ia64 / sn / kernel / bte.c

diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
index cad775a..b2eb484 100644 (file)
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
@@ -114,7 +114,7 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification)
                if (mode & BTE_USE_ANY) {
                        nasid_to_try[1] = my_nasid;
                } else {
-                       nasid_to_try[1] = (int)NULL;
+                       nasid_to_try[1] = 0;
                }
        } else {
                /* try local then remote */
@@ -122,7 +122,7 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification)
                if (mode & BTE_USE_ANY) {
                        nasid_to_try[1] = NASID_GET(dest);
                } else {
-                       nasid_to_try[1] = (int)NULL;
+                       nasid_to_try[1] = 0;
                }
        }