forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: GKI: device.h: add rcu_head back to struct device_link

Browse source 
Commit 80dd33cf72 ("drivers: base: Fix device link removal") upstream
drops the rcu_head from struct device_link.  But we want to drag it back
here in the Android GKI kernel to be 'safe' for future changes where we
might want to switch back to the old method if testing does not work out
well.

This allows us to switch between the different methods in an ABI
compatible way.

Bug: 161946584
Reported-by: Saravana Kannan <saravanak@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If4a56bae6eebe3de5764052b603162071e81bce3
This commit is contained in:
Greg Kroah-Hartman 2021-05-25 13:21:26 +02:00 • committed by Todd Kjos
commit a7d161dc5a
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/device.h
View file

@ -579,6 +579,10 @@ struct device_link {
u32 flags;
refcount_t rpm_active;
struct kref kref;
#ifdef CONFIG_SRCU
/* Not currently used, here for potential abi issues in the future */
struct rcu_head rcu_head;
#endif
struct work_struct rm_work;
bool supplier_preactivated; /* Owned by consumer probe. */
ANDROID_KABI_RESERVE(1);