Merge tag 'please-pull-misc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 cleanups from Tony Luck:
 "Miscellaneous ia64 specific cleanup"

* tag 'please-pull-misc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] sn: Do not needlessly convert between pointers and integers
  [IA64] sn: Fix zeroing of PDAs

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
index cad775a1a157..b2eb48490754 100644
--- 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;
                 }
         }
 
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 53b01b8e2f19..36182c84363c 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -579,7 +579,7 @@ void sn_cpu_init(void)
                        (sn_prom_type == 1) ? "real" : "fake");
         }
 
-        memset(pda, 0, sizeof(pda));
+        memset(pda, 0, sizeof(*pda));
         if (ia64_sn_get_sn_info(0, &sn_hub_info->shub2,
                                 &sn_hub_info->nasid_bitmask,
                                 &sn_hub_info->nasid_shift,