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

Commit 5a18d263 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:
 "Two sparc bug fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix numa node distance initialization
  sparc64: fix incorrect sign extension in sys_sparc64_personality
parents f689b742 36beca65

arch/sparc/kernel/sys_sparc_64.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second 


SYSCALL_DEFINE1(sparc64_personality, unsigned long, personality)

{

	int ret;

	long ret;



	if (personality(current->personality) == PER_LINUX32 &&

	    personality(personality) == PER_LINUX)

arch/sparc/mm/init_64.c

+8 −7
Original line number Diff line number Diff line
@@ -1267,13 +1267,6 @@ static int __init numa_parse_mdesc(void) 
	int i, j, err, count;

	u64 node;



	/* Some sane defaults for numa latency values */

	for (i = 0; i < MAX_NUMNODES; i++) {

		for (j = 0; j < MAX_NUMNODES; j++)

			numa_latency[i][j] = (i == j) ?

				LOCAL_DISTANCE : REMOTE_DISTANCE;

	}



	node = mdesc_node_by_name(md, MDESC_NODE_NULL, "latency-groups");

	if (node == MDESC_NODE_NULL) {

		mdesc_release(md);
@@ -1369,10 +1362,18 @@ static int __init numa_parse_sun4u(void) 


static int __init bootmem_init_numa(void)

{

	int i, j;

	int err = -1;



	numadbg("bootmem_init_numa()\n");



	/* Some sane defaults for numa latency values */

	for (i = 0; i < MAX_NUMNODES; i++) {

		for (j = 0; j < MAX_NUMNODES; j++)

			numa_latency[i][j] = (i == j) ?

				LOCAL_DISTANCE : REMOTE_DISTANCE;

	}



	if (numa_enabled) {

		if (tlb_type == hypervisor)

			err = numa_parse_mdesc();