diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-12-30 12:38:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-30 12:38:53 +0000 |
| commit | 34f653345018c42cedea89b7f6a4aba3783ebd7b (patch) | |
| tree | 663f490f3e16571516dbcce7a2cb2f2545f79dee /kernel/timer.c | |
| parent | regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
Merge tag 'v3.13-rc4' into regmap-core
Needed as a subsequent patch is built on some of the fixes.
Linux 3.13-rc4
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 6582b82fa966..accfd241b9e5 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1518,9 +1518,8 @@ static int init_timers_cpu(int cpu) /* * The APs use this path later in boot */ - base = kmalloc_node(sizeof(*base), - GFP_KERNEL | __GFP_ZERO, - cpu_to_node(cpu)); + base = kzalloc_node(sizeof(*base), GFP_KERNEL, + cpu_to_node(cpu)); if (!base) return -ENOMEM; |