diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2014-02-24 10:40:00 -0500 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-02-24 17:47:05 -0500 |
commit | e0a23b0628b10d25f2c178be6fcfc17c1ab49fda (patch) | |
tree | c412e03c0265362a0538e5db54f1641e2071dac1 /kernel | |
parent | d7877c03f1b62de06f9c00417952f39f56c1ab00 (diff) |
watchdog: Simplify a little the IPI call
In order to remotely restart the watchdog hrtimer, update_timers()
allocates a csd on the stack and pass it to __smp_call_function_single().
There is no partcular need, however, for a specific csd here. Lets
simplify that a little by calling smp_call_function_single()
which can already take care of the csd allocation by itself.
Acked-by: Don Zickus <dzickus@redhat.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@fb.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/watchdog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 4431610f049a..01c6f979486f 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
@@ -505,7 +505,6 @@ static void restart_watchdog_hrtimer(void *info) | |||
505 | 505 | ||
506 | static void update_timers(int cpu) | 506 | static void update_timers(int cpu) |
507 | { | 507 | { |
508 | struct call_single_data data = {.func = restart_watchdog_hrtimer}; | ||
509 | /* | 508 | /* |
510 | * Make sure that perf event counter will adopt to a new | 509 | * Make sure that perf event counter will adopt to a new |
511 | * sampling period. Updating the sampling period directly would | 510 | * sampling period. Updating the sampling period directly would |
@@ -515,7 +514,7 @@ static void update_timers(int cpu) | |||
515 | * might be late already so we have to restart the timer as well. | 514 | * might be late already so we have to restart the timer as well. |
516 | */ | 515 | */ |
517 | watchdog_nmi_disable(cpu); | 516 | watchdog_nmi_disable(cpu); |
518 | __smp_call_function_single(cpu, &data, 1); | 517 | smp_call_function_single(cpu, restart_watchdog_hrtimer, NULL, 1); |
519 | watchdog_nmi_enable(cpu); | 518 | watchdog_nmi_enable(cpu); |
520 | } | 519 | } |
521 | 520 | ||