diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2017-11-03 22:10:18 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-11-03 22:10:18 +0800 |
| commit | ab387f0af24e661fc1c2f609664ec9ae6618e3f0 (patch) | |
| tree | 6254d174314b1bcce11ce28f1aadf0df93e25d8e /arch/frv/include/asm/processor.h | |
| parent | crypto: vmx - Use skcipher for ctr fallback (diff) | |
| parent | Linux 4.14-rc3 (diff) | |
| download | linux-dev-ab387f0af24e661fc1c2f609664ec9ae6618e3f0.tar.xz linux-dev-ab387f0af24e661fc1c2f609664ec9ae6618e3f0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge 4.14-rc3 in order to pick up the new timer_setup function.
Diffstat (limited to 'arch/frv/include/asm/processor.h')
| -rw-r--r-- | arch/frv/include/asm/processor.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h index e4d08d74ed9f..021cce78b401 100644 --- a/arch/frv/include/asm/processor.h +++ b/arch/frv/include/asm/processor.h @@ -92,10 +92,6 @@ static inline void release_thread(struct task_struct *dead_task) extern asmlinkage void save_user_regs(struct user_context *target); extern asmlinkage void *restore_user_regs(const struct user_context *target, ...); -#define copy_segments(tsk, mm) do { } while (0) -#define release_segments(mm) do { } while (0) -#define forget_segments() do { } while (0) - unsigned long get_wchan(struct task_struct *p); #define KSTK_EIP(tsk) ((tsk)->thread.frame0->pc) |