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/um/include/asm/processor-generic.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/um/include/asm/processor-generic.h')
| -rw-r--r-- | arch/um/include/asm/processor-generic.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h index f6d1a3f747a9..86942a492454 100644 --- a/arch/um/include/asm/processor-generic.h +++ b/arch/um/include/asm/processor-generic.h | |||
| @@ -58,11 +58,6 @@ static inline void release_thread(struct task_struct *task) | |||
| 58 | { | 58 | { |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | static inline void mm_copy_segments(struct mm_struct *from_mm, | ||
| 62 | struct mm_struct *new_mm) | ||
| 63 | { | ||
| 64 | } | ||
| 65 | |||
| 66 | #define init_stack (init_thread_union.stack) | 61 | #define init_stack (init_thread_union.stack) |
| 67 | 62 | ||
| 68 | /* | 63 | /* |