Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 489f50be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5167d09f 6b15075c

arch/ia64/sn/kernel/bte.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}

	}

arch/ia64/sn/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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,