Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

e588439d0c ANDROID: ABI: Update allowed list for Microsoft
8afacb8faf ANDROID: GKI: add padding to struct hid_device

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iadaed57ba470d5f54a85a202ee683ae153b36ce7
This commit is contained in:
Greg Kroah-Hartman 2021-08-08 09:13:42 +02:00
commit 1d03502d2e
4 changed files with 4956 additions and 4289 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
[abi_symbol_list]
# required by spi-hid.ko
hid_add_device
hid_allocate_device
hid_destroy_device
hid_input_report
hid_parse_report
spi_async

View File

@ -14,6 +14,7 @@ android/abi_gki_aarch64_goldfish
android/abi_gki_aarch64_hikey960
android/abi_gki_aarch64_imx
android/abi_gki_aarch64_oneplus
android/abi_gki_aarch64_microsoft
android/abi_gki_aarch64_oplus
android/abi_gki_aarch64_qcom
android/abi_gki_aarch64_sony

View File

@ -26,6 +26,7 @@
#include <linux/mutex.h>
#include <linux/power_supply.h>
#include <uapi/linux/hid.h>
#include <linux/android_kabi.h>
/*
* We parse each description item into this structure. Short items data
@ -620,6 +621,9 @@ struct hid_device { /* device report descriptor */
struct list_head debug_list;
spinlock_t debug_list_lock;
wait_queue_head_t debug_wait;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
#define to_hid_device(pdev) \