diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 1258371e0d2b..b7792fb03387 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -1221,7 +1221,8 @@ static int __devinit init_timers_cpu(int cpu) | |||
1221 | /* | 1221 | /* |
1222 | * The APs use this path later in boot | 1222 | * The APs use this path later in boot |
1223 | */ | 1223 | */ |
1224 | base = kmalloc_node(sizeof(*base), GFP_KERNEL, | 1224 | base = kmalloc_node(sizeof(*base), |
1225 | GFP_KERNEL | __GFP_ZERO, | ||
1225 | cpu_to_node(cpu)); | 1226 | cpu_to_node(cpu)); |
1226 | if (!base) | 1227 | if (!base) |
1227 | return -ENOMEM; | 1228 | return -ENOMEM; |
@@ -1232,7 +1233,6 @@ static int __devinit init_timers_cpu(int cpu) | |||
1232 | kfree(base); | 1233 | kfree(base); |
1233 | return -ENOMEM; | 1234 | return -ENOMEM; |
1234 | } | 1235 | } |
1235 | memset(base, 0, sizeof(*base)); | ||
1236 | per_cpu(tvec_bases, cpu) = base; | 1236 | per_cpu(tvec_bases, cpu) = base; |
1237 | } else { | 1237 | } else { |
1238 | /* | 1238 | /* |