Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc109ff1 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Greg Kroah-Hartman
Browse files

ANDROID: Different fix for KABI breakage in 5.4.151 in struct sock 



This partially reverts commit 46590369 ("ANDROID: Fix up KABI
breakage in 5.4.151 in struct sock")

Then fixes things up in such a way that
  BUILD_CONFIG=build/build.config.net_test for kernel_test
still works.

Bug: 202712021
Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Change-Id: I40e24d7924fcffc23a2b8cc5ad50049808aa9455
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 17eb597c

build.config.allmodconfig

+0 −6
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ function update_config() { 
         -d CPU_BIG_ENDIAN \

         -d STM \

         -d TEST_MEMCAT_P \

         -d DEBUG_SPINLOCK \

         -d DEBUG_LOCK_ALLOC \

         -d LOCK_STAT \

         -d DEBUG_WW_MUTEX_SLOWPATH \

         -d DEBUG_LOCK_ALLOC \

         -d PROVE_LOCKING \

         -e UNWINDER_FRAME_POINTER \



    (cd ${OUT_DIR} && \

include/net/sock.h

+9 −0
Original line number Diff line number Diff line
@@ -472,6 +472,11 @@ struct sock { 
	u32			sk_ack_backlog;

	u32			sk_max_ack_backlog;

	kuid_t			sk_uid;

#if IS_ENABLED(CONFIG_DEBUG_SPINLOCK) || IS_ENABLED(CONFIG_DEBUG_LOCK_ALLOC)

	spinlock_t		sk_peer_lock;

#else

	/* sk_peer_lock is in the ANDROID_KABI_RESERVE(1) field below */

#endif

	struct pid		*sk_peer_pid;

	const struct cred	*sk_peer_cred;
@@ -515,7 +520,11 @@ struct sock { 
#endif

	struct rcu_head		sk_rcu;



#if IS_ENABLED(CONFIG_DEBUG_SPINLOCK) || IS_ENABLED(CONFIG_DEBUG_LOCK_ALLOC)

	ANDROID_KABI_RESERVE(1);

#else

	ANDROID_KABI_USE(1, spinlock_t sk_peer_lock);

#endif

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

	ANDROID_KABI_RESERVE(4);