Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I7R8WG
--------------------------------
A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space.
Rename timer_shutdown() to sw64_timer_shutdown() to avoid this conflict.
Signed-off-by: Yu Liao liaoyu15@huawei.com --- arch/sw_64/kernel/timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/sw_64/kernel/timer.c b/arch/sw_64/kernel/timer.c index 268537d5e483..f4745c1c6a78 100644 --- a/arch/sw_64/kernel/timer.c +++ b/arch/sw_64/kernel/timer.c @@ -12,7 +12,7 @@
static int timer_next_event(unsigned long delta, struct clock_event_device *evt); -static int timer_shutdown(struct clock_event_device *evt); +static int sw64_timer_shutdown(struct clock_event_device *evt); static int timer_set_oneshot(struct clock_event_device *evt);
/* @@ -23,7 +23,7 @@ static struct clock_event_device timer_clockevent = { .features = CLOCK_EVT_FEAT_ONESHOT, .shift = 20, .mult = 0, - .set_state_shutdown = timer_shutdown, + .set_state_shutdown = sw64_timer_shutdown, .set_state_oneshot = timer_set_oneshot, .set_next_event = timer_next_event, .rating = 300, @@ -71,7 +71,7 @@ static int timer_next_event(unsigned long delta, return 0; }
-static int timer_shutdown(struct clock_event_device *evt) +static int sw64_timer_shutdown(struct clock_event_device *evt) { wrtimer(0); return 0; @@ -134,7 +134,7 @@ void sw64_timer_interrupt(void) if (!evt->event_handler) { pr_warn("Spurious local timer interrupt on cpu %d\n", smp_processor_id()); - timer_shutdown(evt); + sw64_timer_shutdown(evt); return; }