NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: GKI: timer.h: add Android ABI padding to a structure

Browse source 
Try to mitigate potential future driver core api changes by adding a
padding to struct timer_list.

Based on a change made to the RHEL/CENTOS 8 kernel.

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I74673e2271cd757c4871c9bcb69fd73bb22a722b
This commit is contained in:
Greg Kroah-Hartman 2020-05-02 09:43:50 +02:00 • committed by Carlos Llamas
parent f12cb09789
commit 61963aff03
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/timer.h
View file

@ -7,6 +7,7 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/debugobjects.h> #include <linux/debugobjects.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/android_kabi.h>
struct timer_list { struct timer_list {
/* /*
@ -21,6 +22,9 @@ struct timer_list {
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
struct lockdep_map lockdep_map; struct lockdep_map lockdep_map;
#endif #endif
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP