summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-06-03 15:01:00 -0400
committerThomas Gleixner <tglx@linutronix.de>2017-06-04 09:11:46 -0400
commit31ea70e0308b73a1b862bd17c06efc3cbcfd2016 (patch)
treedf2d01255f179e8b7f0fb4b74bdb0594569d11b8
parent7994200ce69a3873dfa2641254a13bb0a40056f3 (diff)
posix-timers: Move the do_schedule_next_timer declaration
Having it in asm-generic/siginfo.h doesn't make any sense as it is in no way architecture specific. Move it to posix-timers.h instead. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: linux-arch@vger.kernel.org Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Tony Luck <tony.luck@intel.com> Cc: linux-ia64@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de> Cc: sparclinux@vger.kernel.org Cc: "David S. Miller" <davem@davemloft.net> Link: http://lkml.kernel.org/r/20170603190102.28866-4-hch@lst.de
-rw-r--r--include/asm-generic/siginfo.h1
-rw-r--r--include/linux/posix-timers.h3
-rw-r--r--kernel/signal.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index a2508a8f9a9c..5a9394763a66 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -15,7 +15,6 @@
15#define __SI_CODE(T,N) ((T) | ((N) & 0xffff)) 15#define __SI_CODE(T,N) ((T) | ((N) & 0xffff))
16 16
17struct siginfo; 17struct siginfo;
18void do_schedule_next_timer(struct siginfo *info);
19 18
20extern int copy_siginfo_to_user(struct siginfo __user *to, const struct siginfo *from); 19extern int copy_siginfo_to_user(struct siginfo __user *to, const struct siginfo *from);
21 20
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 34e893a75771..8929f7e8f452 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -7,6 +7,7 @@
7#include <linux/timex.h> 7#include <linux/timex.h>
8#include <linux/alarmtimer.h> 8#include <linux/alarmtimer.h>
9 9
10struct siginfo;
10 11
11struct cpu_timer_list { 12struct cpu_timer_list {
12 struct list_head entry; 13 struct list_head entry;
@@ -120,4 +121,6 @@ long clock_nanosleep_restart(struct restart_block *restart_block);
120 121
121void update_rlimit_cpu(struct task_struct *task, unsigned long rlim_new); 122void update_rlimit_cpu(struct task_struct *task, unsigned long rlim_new);
122 123
124void do_schedule_next_timer(struct siginfo *info);
125
123#endif 126#endif
diff --git a/kernel/signal.c b/kernel/signal.c
index ca92bcfeb322..1f85c843be8e 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -39,6 +39,7 @@
39#include <linux/compat.h> 39#include <linux/compat.h>
40#include <linux/cn_proc.h> 40#include <linux/cn_proc.h>
41#include <linux/compiler.h> 41#include <linux/compiler.h>
42#include <linux/posix-timers.h>
42 43
43#define CREATE_TRACE_POINTS 44#define CREATE_TRACE_POINTS
44#include <trace/events/signal.h> 45#include <trace/events/signal.h>