git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index
1258371
..
b7792fb
100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-1221,7
+1221,8
@@
static int __devinit init_timers_cpu(int cpu)
/*
* The APs use this path later in boot
*/
/*
* The APs use this path later in boot
*/
- base = kmalloc_node(sizeof(*base), GFP_KERNEL,
+ base = kmalloc_node(sizeof(*base),
+ GFP_KERNEL | __GFP_ZERO,
cpu_to_node(cpu));
if (!base)
return -ENOMEM;
cpu_to_node(cpu));
if (!base)
return -ENOMEM;
@@
-1232,7
+1233,6
@@
static int __devinit init_timers_cpu(int cpu)
kfree(base);
return -ENOMEM;
}
kfree(base);
return -ENOMEM;
}
- memset(base, 0, sizeof(*base));
per_cpu(tvec_bases, cpu) = base;
} else {
/*
per_cpu(tvec_bases, cpu) = base;
} else {
/*