diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-04-08 17:23:01 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-04-08 17:23:01 +0300 |
| commit | 9934b0777eb51be77e70b877451d3198bcf79483 (patch) | |
| tree | da1ca5e2d3316f077cc9ff98fdfe7f26f046a8c5 | |
| parent | ca147aeafcfbff5796e3234268663248e6ef479f (diff) | |
arch/arm64/kernel/signal32.c: fix a merge errortracking-linaro-android-llct-llct-20150408.0
Commit db2413ad14d0 ("Merge branch 'linaro-fixes/android-3.18' into
linaro-android-llct") causes the following error:
arch/arm64/kernel/signal32.c: In function ‘copy_siginfo_to_user32’:
arch/arm64/kernel/signal32.c:195:2: error: duplicate case value
case __SI_SYS:
^
arch/arm64/kernel/signal32.c:188:2: error: previously used here
case __SI_SYS:
^
scripts/Makefile.build:258: recipe for target 'arch/arm64/kernel/signal32.o' failed
make[2]: *** [arch/arm64/kernel/signal32.o] Error 1
Commit cc5e9097c9aad6b1 "arm64: add SIGSYS siginfo for compat task" has been
accepted upstream. But linaro-fixes/android-3.18 still carries its older
version - commit 17fa5771f529bf9d.
Reported-by: Jon Medhurst (Tixy) tixy@linaro.org
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | arch/arm64/kernel/signal32.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index aaa6840a873c..d26fcd4cd6e6 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -191,14 +191,6 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) err |= __put_user(from->si_syscall, &to->si_syscall); err |= __put_user(from->si_arch, &to->si_arch); break; -#ifdef __ARCH_SIGSYS - case __SI_SYS: - err |= __put_user((compat_uptr_t)(unsigned long) - from->si_call_addr, &to->si_call_addr); - err |= __put_user(from->si_syscall, &to->si_syscall); - err |= __put_user(from->si_arch, &to->si_arch); - break; -#endif default: /* this is just in case for now ... */ err |= __put_user(from->si_pid, &to->si_pid); err |= __put_user(from->si_uid, &to->si_uid); |