shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "timers: Rename del_timer() to timer_delete()"

Browse Source 
This reverts commit b086d1e82f which is
commit bb663f0f3c upstream.

It breaks the Android kernel abi by turning del_timer() into an
inline function, which breaks the abi.  Fix this by putting it back
as needed AND fix up the only use of this new function in
net/hsr/hsr_device.c which is what caused this commit to be backported
to 6.1.91 in the first place.

Bug: 161946584
Change-Id: I033a9b5d57acaffdfc1973f6f77bc4e92675b7e4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-22 12:32:24 +00:00
parent 38eb9de84b
commit 2587385ace
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/timer.h
View File

@@ -173,6 +173,7 @@ static inline int timer_pending(const struct timer_list * timer)
}
extern void add_timer_on(struct timer_list *timer, int cpu);
extern int del_timer(struct timer_list * timer);
extern int mod_timer(struct timer_list *timer, unsigned long expires);
extern int mod_timer_pending(struct timer_list *timer, unsigned long expires);
extern int timer_reduce(struct timer_list *timer, unsigned long expires);
@@ -187,7 +188,6 @@ 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);
/**
* del_timer_sync - Delete a pending timer and wait for a running callback
@@ -202,19 +202,6 @@ 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);
struct hrtimer;
extern enum hrtimer_restart it_real_fn(struct hrtimer *);

6
kernel/time/timer.c
View File

@@ -1261,7 +1261,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
EXPORT_SYMBOL_GPL(add_timer_on);
/**
* timer_delete - Deactivate a timer
* del_timer - Deactivate a timer.
* @timer: The timer to be deactivated
*
* The function only deactivates a pending timer, but contrary to
@@ -1274,7 +1274,7 @@ EXPORT_SYMBOL_GPL(add_timer_on);
* * %0 - The timer was not pending
* * %1 - The timer was pending and deactivated
*/
int timer_delete(struct timer_list *timer)
int del_timer(struct timer_list *timer)
{
struct timer_base *base;
unsigned long flags;
@@ -1290,7 +1290,7 @@ int timer_delete(struct timer_list *timer)
return ret;
}
EXPORT_SYMBOL(timer_delete);
EXPORT_SYMBOL(del_timer);
/**
* try_to_del_timer_sync - Try to deactivate a timer

2
net/hsr/hsr_device.c
View File

@@ -85,7 +85,7 @@ static void hsr_check_announce(struct net_device *hsr_dev)
}
} else {
/* Deactivate the announce timer */
timer_delete(&hsr->announce_timer);
del_timer(&hsr->announce_timer);
}
}