aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/include/asm/processor.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-09 03:02:35 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-09 03:02:35 -0400
commit1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee (patch)
tree47da3feee8e263e8c9352c85cf518e624be3c211 /arch/m32r/include/asm/processor.h
parent750b1a6894ecc9b178c6e3d0a1170122971b2036 (diff)
parent8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (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/m32r/include/asm/processor.h')
-rw-r--r--arch/m32r/include/asm/processor.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/m32r/include/asm/processor.h b/arch/m32r/include/asm/processor.h
index 657874eeeccc..c70fa9ac7169 100644
--- a/arch/m32r/include/asm/processor.h
+++ b/arch/m32r/include/asm/processor.h
@@ -118,14 +118,6 @@ struct mm_struct;
118/* Free all resources held by a thread. */ 118/* Free all resources held by a thread. */
119extern void release_thread(struct task_struct *); 119extern void release_thread(struct task_struct *);
120 120
121/* Copy and release all segment info associated with a VM */
122extern void copy_segments(struct task_struct *p, struct mm_struct * mm);
123extern void release_segments(struct mm_struct * mm);
124
125/* Copy and release all segment info associated with a VM */
126#define copy_segments(p, mm) do { } while (0)
127#define release_segments(mm) do { } while (0)
128
129unsigned long get_wchan(struct task_struct *p); 121unsigned long get_wchan(struct task_struct *p);
130#define KSTK_EIP(tsk) ((tsk)->thread.lr) 122#define KSTK_EIP(tsk) ((tsk)->thread.lr)
131#define KSTK_ESP(tsk) ((tsk)->thread.sp) 123#define KSTK_ESP(tsk) ((tsk)->thread.sp)