Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

[platform/adaptation/renesas_rcar/renesas_kernel.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 6582b82..accfd24 100644 (file)
--- 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;