Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"

This reverts commit f553ed04bc and really
does merge v5.4.60 into the tree.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I164a49d7930e441b52c8a80b2fa5aa2b7ec41ed9
This commit is contained in:
Greg Kroah-Hartman 2020-08-23 12:45:23 +02:00
commit 2669cd8a3e
151 changed files with 1084 additions and 626 deletions

View file

@ -42,6 +42,8 @@
#define R_ARM_THM_CALL 10
#define R_ARM_CALL 28
#define R_AARCH64_CALL26 283
static int fd_map; /* File descriptor for file being modified. */
static int mmap_failed; /* Boolean flag. */
static char gpfx; /* prefix for global symbol name (sometimes '_') */