Commit-ID: 31ea70e0308b73a1b862bd17c06efc3cbcfd2016
Gitweb: http://git.kernel.org/tip/31ea70e0308b73a1b862bd17c06efc3cbcfd2016
Author: Christoph Hellwig <hch@xxxxxx>
AuthorDate: Sat, 3 Jun 2017 21:01:00 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Sun, 4 Jun 2017 15:11:46 +0200
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@xxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: linux-arch@xxxxxxxxxxxxxxx
Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Cc: linux-ia64@xxxxxxxxxxxxxxx
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: sparclinux@xxxxxxxxxxxxxxx
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20170603190102.28866-4-hch@xxxxxx
---
include/asm-generic/siginfo.h | 1 -
include/linux/posix-timers.h | 3 +++
kernel/signal.c | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index a2508a8..5a93947 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -15,7 +15,6 @@
#define __SI_CODE(T,N) ((T) | ((N) & 0xffff))
struct siginfo;
-void do_schedule_next_timer(struct siginfo *info);
extern int copy_siginfo_to_user(struct siginfo __user *to, const struct siginfo *from);
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 34e893a..8929f7e 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -7,6 +7,7 @@
#include <linux/timex.h>
#include <linux/alarmtimer.h>
+struct siginfo;
struct cpu_timer_list {
struct list_head entry;
@@ -120,4 +121,6 @@ long clock_nanosleep_restart(struct restart_block *restart_block);
void update_rlimit_cpu(struct task_struct *task, unsigned long rlim_new);
+void do_schedule_next_timer(struct siginfo *info);
+
#endif
diff --git a/kernel/signal.c b/kernel/signal.c
index ca92bcf..1f85c84 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -39,6 +39,7 @@
#include <linux/compat.h>
#include <linux/cn_proc.h>
#include <linux/compiler.h>
+#include <linux/posix-timers.h>
#define CREATE_TRACE_POINTS
#include <trace/events/signal.h>
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|