From 9298a1e640acc1dcc09f94da40a2d15e7f803dbf Mon Sep 17 00:00:00 2001 From: Maria Yu Date: Thu, 29 Nov 2018 13:57:53 +0800 Subject: [PATCH] ANDROID: GKI: locking/rwsem: add vendor field to struct rw_semaphore For ABI compatibility, we are adding a vendor field to support the config CONFIG_RWSEM_PRIO_AWARE. Bug: 151792119 Bug: 148872640 Signed-off-by: Maria Yu Signed-off-by: Biao long [willmcvicker: Only cherry-picked the ABI diff] (cherry picked from commit c4b6927bb644d57775c601bbd5d9ce3f346ee1b9) Signed-off-by: Will McVicker Change-Id: I3f289e2992af340b56c2df532ffeb418abf3da79 --- include/linux/rwsem.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index ab93b6eae696..93c2235349a0 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -42,6 +42,11 @@ struct rw_semaphore { #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lockdep_map dep_map; #endif + /* NOTICE: m_count is a vendor variable used for the config + * CONFIG_RWSEM_PRIO_AWARE. This is included here to maintain ABI + * compatibility with our vendors */ + /* count for waiters preempt to queue in wait list */ + long m_count; }; /*