xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: device.h: add Android ABI padding to some structures

Browse Source 
Try to mitigate potential future driver core api changes by padding to
struct bus_type, struct device_driver, struct class, and struct device.

Based on a patch from Michal Marek <mmarek@suse.cz> from the SLES kernel

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6892cde6481ba775789f0c02239dcfde3a26b56e
This commit is contained in:
Greg Kroah-Hartman
2020-03-10 18:31:03 +01:00
committed by Todd Kjos
parent aea5e1c230
commit 429c78f9b0
4 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/device.h
View File

@@ -30,6 +30,7 @@
#include <linux/device/bus.h> #include <linux/device/bus.h>
#include <linux/device/class.h> #include <linux/device/class.h>
#include <linux/device/driver.h> #include <linux/device/driver.h>
#include <linux/android_kabi.h>
#include <asm/device.h> #include <asm/device.h>
struct device; struct device;
@@ -553,6 +554,14 @@ struct device {
#ifdef CONFIG_DMA_OPS_BYPASS #ifdef CONFIG_DMA_OPS_BYPASS
bool dma_ops_bypass : 1; bool dma_ops_bypass : 1;
#endif #endif
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
ANDROID_KABI_RESERVE(5);
ANDROID_KABI_RESERVE(6);
ANDROID_KABI_RESERVE(7);
ANDROID_KABI_RESERVE(8);
}; };
/** /**

5
include/linux/device/bus.h
View File

@@ -112,6 +112,11 @@ struct bus_type {
struct lock_class_key lock_key; struct lock_class_key lock_key;
bool need_parent_lock; bool need_parent_lock;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
extern int __must_check bus_register(struct bus_type *bus); extern int __must_check bus_register(struct bus_type *bus);

4
include/linux/device/class.h
View File

@@ -76,7 +76,11 @@ struct class {
const struct dev_pm_ops *pm; const struct dev_pm_ops *pm;
struct subsys_private *p; struct subsys_private *p;
ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
struct class_dev_iter { struct class_dev_iter {

5
include/linux/device/driver.h
View File

@@ -118,6 +118,11 @@ struct device_driver {
void (*coredump) (struct device *dev); void (*coredump) (struct device *dev);
struct driver_private *p; struct driver_private *p;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };