git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
kernel
/
sched
/
topology.c
diff --git
a/kernel/sched/topology.c
b/kernel/sched/topology.c
index 9d74371e4aad86a436c549045be08c2a1ed30853..8d7f15ba59163c3a496f0284c2473a0575d57958 100644
(file)
--- a/
kernel/sched/topology.c
+++ b/
kernel/sched/topology.c
@@
-1337,7
+1337,7
@@
void sched_init_numa(void)
int level = 0;
int i, j, k;
- sched_domains_numa_distance = kzalloc(sizeof(int) *
nr_node_ids
, GFP_KERNEL);
+ sched_domains_numa_distance = kzalloc(sizeof(int) *
(nr_node_ids + 1)
, GFP_KERNEL);
if (!sched_domains_numa_distance)
return;