tick_setup_device() is always passed cpumask of 'cpu' and 'cpu' is always
obtained from smp_processor_id(). Remove these two parameters and obtain them in
tick_setup_device() instead.

Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org>
---
 kernel/time/tick-common.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 896c992..85ee9fd 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -145,9 +145,10 @@ void tick_setup_periodic(struct clock_event_device *dev, 
int broadcast)
  * Setup the tick device
  */
 static void tick_setup_device(struct tick_device *td,
-                             struct clock_event_device *newdev, int cpu,
-                             const struct cpumask *cpumask)
+                             struct clock_event_device *newdev)
 {
+       int cpu = smp_processor_id();
+       const struct cpumask *cpumask = cpumask_of(cpu);
        ktime_t next_event;
        void (*handler)(struct clock_event_device *) = NULL;
 
@@ -206,10 +207,9 @@ static void tick_setup_device(struct tick_device *td,
 void tick_install_replacement(struct clock_event_device *newdev)
 {
        struct tick_device *td = tick_get_cpu_device();
-       int cpu = smp_processor_id();
 
        clockevents_exchange_device(td->evtdev, newdev);
-       tick_setup_device(td, newdev, cpu, cpumask_of(cpu));
+       tick_setup_device(td, newdev);
        if (newdev->features & CLOCK_EVT_FEAT_ONESHOT)
                tick_oneshot_notify();
 }
@@ -287,7 +287,7 @@ void tick_check_new_device(struct clock_event_device 
*newdev)
                curdev = NULL;
        }
        clockevents_exchange_device(curdev, newdev);
-       tick_setup_device(td, newdev, cpu, cpumask_of(cpu));
+       tick_setup_device(td, newdev);
        if (newdev->features & CLOCK_EVT_FEAT_ONESHOT)
                tick_oneshot_notify();
        return;
-- 
1.7.12.rc2.18.g61b472e

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to