Merge branch 'android14-6.1' into branch 'android14-6.1-lts'

We need the abi updates to be merged to the -lts branch so we can
properly track the new symbols.  This includes the following commit:

089d1b8f6d ANDROID: Add known structs used by modules to KMI

Change-Id: Ie1915aedf85ab42761c27cfb63283be675f11c86
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-04-17 08:26:45 +00:00
commit f28d3f0d96
5 changed files with 1914 additions and 8 deletions

View File

@ -120,6 +120,7 @@ filegroup(
"android/abi_gki_aarch64_rockchip",
"android/abi_gki_aarch64_sony",
"android/abi_gki_aarch64_tuxera",
"android/abi_gki_aarch64_type_visibility",
"android/abi_gki_aarch64_unisoc",
"android/abi_gki_aarch64_virtual_device",
"android/abi_gki_aarch64_vivo",

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,5 @@
[abi_symbol_list]
# for type visibility
ANDROID_GKI_struct_dwc3
ANDROID_GKI_struct_kernel_all_info

View File

@ -193,6 +193,12 @@ static struct platform_driver debug_kinfo_driver = {
};
module_platform_driver(debug_kinfo_driver);
/*
* For type visibility
*/
const struct kernel_all_info *const ANDROID_GKI_struct_kernel_all_info;
EXPORT_SYMBOL_GPL(ANDROID_GKI_struct_kernel_all_info);
MODULE_AUTHOR("Jone Chou <jonechou@google.com>");
MODULE_DESCRIPTION("Debug Kinfo Driver");
MODULE_LICENSE("GPL v2");

View File

@ -2323,6 +2323,12 @@ static struct platform_driver dwc3_driver = {
module_platform_driver(dwc3_driver);
/*
* For type visibility (http://b/236036821)
*/
const struct dwc3 *const ANDROID_GKI_struct_dwc3;
EXPORT_SYMBOL_GPL(ANDROID_GKI_struct_dwc3);
MODULE_ALIAS("platform:dwc3");
MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
MODULE_LICENSE("GPL v2");