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/c6x/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/c6x/include/asm/processor.h')
| -rw-r--r-- | arch/c6x/include/asm/processor.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/c6x/include/asm/processor.h b/arch/c6x/include/asm/processor.h index 7c87b5be53b5..8f7cce829f8e 100644 --- a/arch/c6x/include/asm/processor.h +++ b/arch/c6x/include/asm/processor.h | |||
| @@ -92,9 +92,6 @@ static inline void release_thread(struct task_struct *dead_task) | |||
| 92 | { | 92 | { |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | #define copy_segments(tsk, mm) do { } while (0) | ||
| 96 | #define release_segments(mm) do { } while (0) | ||
| 97 | |||
| 98 | /* | 95 | /* |
| 99 | * saved kernel SP and DP of a blocked thread. | 96 | * saved kernel SP and DP of a blocked thread. |
| 100 | */ | 97 | */ |