diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 03:02:35 -0400 |
| commit | 1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee (patch) | |
| tree | 47da3feee8e263e8c9352c85cf518e624be3c211 /arch/arc/include/asm/processor.h | |
| parent | 750b1a6894ecc9b178c6e3d0a1170122971b2036 (diff) | |
| parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
Merge 4.14-rc4 into staging-next
We want the staging/iio fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arc/include/asm/processor.h')
| -rw-r--r-- | arch/arc/include/asm/processor.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index d400a2161935..8ee41e988169 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h | |||
| @@ -78,9 +78,6 @@ struct task_struct; | |||
| 78 | 78 | ||
| 79 | #endif | 79 | #endif |
| 80 | 80 | ||
| 81 | #define copy_segments(tsk, mm) do { } while (0) | ||
| 82 | #define release_segments(mm) do { } while (0) | ||
| 83 | |||
| 84 | #define KSTK_EIP(tsk) (task_pt_regs(tsk)->ret) | 81 | #define KSTK_EIP(tsk) (task_pt_regs(tsk)->ret) |
| 85 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->sp) | 82 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->sp) |
| 86 | 83 | ||