diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:24 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:41 +0000 |
| commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
| tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /kernel/timer.c | |
| parent | d13733f4a24d93c582f22f17b5434cf195b7d505 (diff) | |
| parent | 1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (diff) | |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
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 6582b82fa96..accfd241b9e 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; |