Commit ec2d781a authored by Yu Liao's avatar Yu Liao
Browse files

timers: Keep del_timer[_sync]() exported 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7R8WG



--------------------------------

A previous commit made del_timer[_sync]() obsolete and unexported, which
caused kabi to break. So making del_timer[_sync]() exported, the same as
before.

Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
parent 4bf511b4

include/linux/timer.h

+2 −26
Original line number Diff line number Diff line
@@ -190,35 +190,11 @@ extern void add_timer(struct timer_list *timer); 
extern int try_to_del_timer_sync(struct timer_list *timer);

extern int timer_delete_sync(struct timer_list *timer);

extern int timer_delete(struct timer_list *timer);

extern int del_timer_sync(struct timer_list *timer);

extern int del_timer(struct timer_list *timer);

extern int timer_shutdown_sync(struct timer_list *timer);

extern int timer_shutdown(struct timer_list *timer);



/**

 * del_timer_sync - Delete a pending timer and wait for a running callback

 * @timer:	The timer to be deleted

 *

 * See timer_delete_sync() for detailed explanation.

 *

 * Do not use in new code. Use timer_delete_sync() instead.

 */

static inline int del_timer_sync(struct timer_list *timer)

{

	return timer_delete_sync(timer);

}



/**

 * del_timer - Delete a pending timer

 * @timer:	The timer to be deleted

 *

 * See timer_delete() for detailed explanation.

 *

 * Do not use in new code. Use timer_delete() instead.

 */

static inline int del_timer(struct timer_list *timer)

{

	return timer_delete(timer);

}



extern void init_timers(void);

extern void run_local_timers(void);

struct hrtimer;

kernel/time/timer.c

+28 −0
Original line number Diff line number Diff line
@@ -1309,6 +1309,20 @@ int timer_delete(struct timer_list *timer) 
}

EXPORT_SYMBOL(timer_delete);



/**

 * del_timer - Delete a pending timer

 * @timer:	The timer to be deleted

 *

 * See timer_delete() for detailed explanation.

 *

 * Do not use in new code. Use timer_delete() instead.

 */

int del_timer(struct timer_list *timer)

{

	return __timer_delete(timer, false);

}

EXPORT_SYMBOL(del_timer);



/**

 * timer_shutdown - Deactivate a timer and prevent rearming

 * @timer:	The timer to be deactivated
@@ -1569,6 +1583,20 @@ int timer_delete_sync(struct timer_list *timer) 
}

EXPORT_SYMBOL(timer_delete_sync);



/**

 * del_timer_sync - Delete a pending timer and wait for a running callback

 * @timer:	The timer to be deleted

 *

 * See timer_delete_sync() for detailed explanation.

 *

 * Do not use in new code. Use timer_delete_sync() instead.

 */

int del_timer_sync(struct timer_list *timer)

{

	return __timer_delete_sync(timer, false);

}

EXPORT_SYMBOL(del_timer_sync);



/**

 * timer_shutdown_sync - Shutdown a timer and prevent rearming

 * @timer: The timer to be shutdown