Commit 8963a747 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "timers: Rename del_timer_sync() to timer_delete_sync()"



This reverts commit d8166e8a which is
commit 9b13df3f upstream.

It breaks the Android kernel abi by turning del_timer_sync() 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
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c which is
what caused this commit to be backported to 5.4.274 in the first place.

Bug: 161946584
Change-Id: Icd26c7c81e6172f36eeeb69827989bfab1d32afe
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 2fe18be9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment