diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-30 01:53:57 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-30 01:53:57 +0100 |
| commit | fbd22402164e687fd1be9a1372ee4f6b9373c860 (patch) | |
| tree | fd86c8b2f8ed120a2229a1de7959f0d4e56c8008 /kernel/timer.c | |
| parent | f78c4cffb86a9f1732674d810ac338cd694b1885 (diff) | |
| parent | c606850407d9096415e226c75a871d0650404446 (diff) | |
| download | linux-fbd22402164e687fd1be9a1372ee4f6b9373c860.tar.gz linux-fbd22402164e687fd1be9a1372ee4f6b9373c860.tar.bz2 linux-fbd22402164e687fd1be9a1372ee4f6b9373c860.zip | |
Merge back earlier 'pm-sleep' material.
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; |