diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-02 21:56:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-09-02 21:56:43 -0700 |
| commit | 4910099d3ab28deb4f7c2fd88ef5eef5362e26df (patch) | |
| tree | 4de7fc2634214ae72d7453183884b6b8b6e654be /scripts | |
| parent | 2a61e30d4462de293371173af5c153e0ea195f0e (diff) | |
| parent | 7b0c4ab61ef1dc4eaa00ee0d9b4c50ca0193ad75 (diff) | |
Merge "Merge android-4.4.188 (886d085) into msm-4.4"
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kallsyms.c | 3 | ||||
| -rw-r--r-- | scripts/recordmcount.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 8fa81e84e295..d117c68d1607 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c @@ -158,6 +158,9 @@ static int read_symbol(FILE *in, struct sym_entry *s) /* exclude debugging symbols */ else if (stype == 'N') return -1; + /* exclude s390 kasan local symbols */ + else if (!strncmp(sym, ".LASANPC", 8)) + return -1; /* include the type field in the symbol name, so that it gets * compressed together */ diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h index b9897e2be404..04151ede8043 100644 --- a/scripts/recordmcount.h +++ b/scripts/recordmcount.h @@ -326,7 +326,8 @@ static uint_t *sift_rel_mcount(uint_t *mlocp, if (!mcountsym) mcountsym = get_mcountsym(sym0, relp, str0); - if (mcountsym == Elf_r_sym(relp) && !is_fake_mcount(relp)) { + if (mcountsym && mcountsym == Elf_r_sym(relp) && + !is_fake_mcount(relp)) { uint_t const addend = _w(_w(relp->r_offset) - recval + mcount_adjust); mrelp->r_offset = _w(offbase |