anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: update the .xml file based on previous LTS merge

Browse Source 
The merge of the -lts branch caused a crc issue in the
kobject_get_path() usage, as the update was done incorrectly, so fix
that up and update the .xml file to handle the other ABI changes that
were required due to the LTS merge:

function symbol changed from 'char * kobject_get_path(struct kobject *, gfp_t)' to 'char * kobject_get_path(const struct kobject *, gfp_t)'
  type changed from 'char *(struct kobject *, gfp_t)' to 'char *(const struct kobject *, gfp_t)'
    parameter 1 ('kobj') type changed from 'struct kobject *' to 'const struct kobject *'
      pointed-to type changed from 'struct kobject' to 'const struct kobject'
        qualifier const added

type 'struct hid_device' changed
  member 'union { struct { u32 initial_quirks; u32 padding; }; struct { u64 android_kabi_reserved1; }; union { }; }' was added
  member 'u64 android_kabi_reserved1' was removed

type 'struct dwc3' changed
  member 'union { struct dentry * debug_root; struct { u64 android_kabi_reserved2; }; union { }; }' was added
  member 'u64 android_kabi_reserved2' was removed

Fixes: e8bfba508c ("kobject: modify kobject_get_path() to take a const *")
Fixes: 23818c192b ("Merge tag 'android13-5.15.104_r00' into android13-5.15")
Change-Id: I07336b836afc0865d7c700e9c5bc1278562549a7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-05-29 10:35:17 +00:00
committed by Todd Kjos
parent d00dcb7d76
commit 81edb450dd
2 changed files with 3288 additions and 3247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6531
android/abi_gki_aarch64.xml
View File

File diff suppressed because it is too large Load Diff

4
include/linux/kobject.h
View File

@@ -122,7 +122,11 @@ extern void kobject_put(struct kobject *kobj);
extern const void *kobject_namespace(struct kobject *kobj);
extern void kobject_get_ownership(struct kobject *kobj,
kuid_t *uid, kgid_t *gid);
#ifdef __GENKSYMS__ // ANDROID KABI CRC preservation
extern char *kobject_get_path(struct kobject *kobj, gfp_t flag);
#else
extern char *kobject_get_path(const struct kobject *kobj, gfp_t flag);
#endif
/**
* kobject_has_children - Returns whether a kobject has children.