diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-30 12:43:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-30 12:43:08 -0400 |
| commit | b07911593719828cac023bdcf6bf4da1c9ba546f (patch) | |
| tree | c4d2f66e6f2506e5b5439ffca0449e646f677b33 /arch/frv | |
| parent | 52a623bd6189b6ea8f06a0d7594c7604deaab24a (diff) | |
| parent | 4d8a991d460d4fa4829beaffdcba45a217ca0fa7 (diff) | |
| download | linux-b07911593719828cac023bdcf6bf4da1c9ba546f.tar.gz linux-b07911593719828cac023bdcf6bf4da1c9ba546f.tar.bz2 linux-b07911593719828cac023bdcf6bf4da1c9ba546f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker
driver, nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/include/asm/processor.h | 5 | ||||
| -rw-r--r-- | arch/frv/kernel/process.c | 9 |
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h index ddaeb9cc9143..e4d08d74ed9f 100644 --- a/arch/frv/include/asm/processor.h +++ b/arch/frv/include/asm/processor.h @@ -96,11 +96,6 @@ extern asmlinkage void *restore_user_regs(const struct user_context *target, ... #define release_segments(mm) do { } while (0) #define forget_segments() do { } while (0) -/* - * Return saved PC of a blocked thread. - */ -extern unsigned long thread_saved_pc(struct task_struct *tsk); - unsigned long get_wchan(struct task_struct *p); #define KSTK_EIP(tsk) ((tsk)->thread.frame0->pc) diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c index 5a4c92abc99e..a957b374e3a6 100644 --- a/arch/frv/kernel/process.c +++ b/arch/frv/kernel/process.c @@ -198,15 +198,6 @@ unsigned long get_wchan(struct task_struct *p) return 0; } -unsigned long thread_saved_pc(struct task_struct *tsk) -{ - /* Check whether the thread is blocked in resume() */ - if (in_sched_functions(tsk->thread.pc)) - return ((unsigned long *)tsk->thread.fp)[2]; - else - return tsk->thread.pc; -} - int elf_check_arch(const struct elf32_hdr *hdr) { unsigned long hsr0 = __get_HSR(0); |