diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-07 09:16:31 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-07 09:16:30 -0800 |
| commit | d30c02ed5bce2c101768121402000ee780fb8d71 (patch) | |
| tree | 7db60f7b333be05a3e667480ea15a0c06eacaa6a /arch/arm64 | |
| parent | 40cb35870700b174f3e2db77c855920458a96c16 (diff) | |
| parent | 863577dd59f54becb161ecb1918169022bae6f36 (diff) | |
Merge "Merge android-4.4.116 (20ddb25) into msm-4.4"
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/image.h | 1 | ||||
| -rw-r--r-- | arch/arm64/kernel/process.c | 7 | ||||
| -rw-r--r-- | arch/arm64/lib/strnlen.S | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index f0be31f1dd45..86d444f9c2c1 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -100,6 +100,7 @@ __efistub_memcpy = KALLSYMS_HIDE(__pi_memcpy); __efistub_memmove = KALLSYMS_HIDE(__pi_memmove); __efistub_memset = KALLSYMS_HIDE(__pi_memset); __efistub_strlen = KALLSYMS_HIDE(__pi_strlen); +__efistub_strnlen = KALLSYMS_HIDE(__pi_strnlen); __efistub_strcmp = KALLSYMS_HIDE(__pi_strcmp); __efistub_strncmp = KALLSYMS_HIDE(__pi_strncmp); __efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area); diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 6df738c01f42..5dd9b572259f 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -274,13 +274,6 @@ void show_regs(struct pt_regs * regs) __show_regs(regs); } -/* - * Free current thread data structures etc.. - */ -void exit_thread(void) -{ -} - static void tls_thread_flush(void) { asm ("msr tpidr_el0, xzr"); diff --git a/arch/arm64/lib/strnlen.S b/arch/arm64/lib/strnlen.S index 2ca665711bf2..eae38da6e0bb 100644 --- a/arch/arm64/lib/strnlen.S +++ b/arch/arm64/lib/strnlen.S @@ -168,4 +168,4 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ .Lhit_limit: mov len, limit ret -ENDPROC(strnlen) +ENDPIPROC(strnlen) |