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

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
...@@ -413,7 +413,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second ...@@ -413,7 +413,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second
SYSCALL_DEFINE1(sparc64_personality, unsigned long, personality) SYSCALL_DEFINE1(sparc64_personality, unsigned long, personality)
{ {
int ret; long ret;
if (personality(current->personality) == PER_LINUX32 && if (personality(current->personality) == PER_LINUX32 &&
personality(personality) == PER_LINUX) personality(personality) == PER_LINUX)
......
...@@ -1267,13 +1267,6 @@ static int __init numa_parse_mdesc(void) ...@@ -1267,13 +1267,6 @@ static int __init numa_parse_mdesc(void)
int i, j, err, count; int i, j, err, count;
u64 node; 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"); node = mdesc_node_by_name(md, MDESC_NODE_NULL, "latency-groups");
if (node == MDESC_NODE_NULL) { if (node == MDESC_NODE_NULL) {
mdesc_release(md); mdesc_release(md);
...@@ -1369,10 +1362,18 @@ static int __init numa_parse_sun4u(void) ...@@ -1369,10 +1362,18 @@ static int __init numa_parse_sun4u(void)
static int __init bootmem_init_numa(void) static int __init bootmem_init_numa(void)
{ {
int i, j;
int err = -1; int err = -1;
numadbg("bootmem_init_numa()\n"); 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 (numa_enabled) {
if (tlb_type == hypervisor) if (tlb_type == hypervisor)
err = numa_parse_mdesc(); err = numa_parse_mdesc();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment