All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Arnd Bergmann <arnd@arndb.de>,
	Thomas Gleixner <tglx@linutronix.de>,
	"David S. Miller" <davem@davemloft.net>,
	Tony Luck <tony.luck@intel.com>,
	Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-arch@vger.kernel.org, sparclinux@vger.kernel.org,
	linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] posix-timers: move the do_schedule_next_timer declaration
Date: Sat,  3 Jun 2017 21:01:00 +0200	[thread overview]
Message-ID: <20170603190102.28866-4-hch@lst.de> (raw)
In-Reply-To: <20170603190102.28866-1-hch@lst.de>

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>
---
 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 a2508a8f9a9c..5a9394763a66 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 8c1e43ab14a9..fa25c23192a4 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;
@@ -125,4 +126,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 ca92bcfeb322..1f85c843be8e 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>
-- 
2.11.0

WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Arnd Bergmann <arnd@arndb.de>,
	Thomas Gleixner <tglx@linutronix.de>,
	"David S. Miller" <davem@davemloft.net>,
	Tony Luck <tony.luck@intel.com>,
	Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-arch@vger.kernel.org, sparclinux@vger.kernel.org,
	linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] posix-timers: move the do_schedule_next_timer declaration
Date: Sat, 03 Jun 2017 19:01:00 +0000	[thread overview]
Message-ID: <20170603190102.28866-4-hch@lst.de> (raw)
In-Reply-To: <20170603190102.28866-1-hch@lst.de>

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>
---
 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 a2508a8f9a9c..5a9394763a66 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 8c1e43ab14a9..fa25c23192a4 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;
@@ -125,4 +126,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 ca92bcfeb322..1f85c843be8e 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>
-- 
2.11.0


  parent reply	other threads:[~2017-06-03 19:01 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-03 19:00 untangle the <asm/siginfo.h> mess Christoph Hellwig
2017-06-03 19:00 ` Christoph Hellwig
2017-06-03 19:00 ` [PATCH 1/5] sparc: simplify <asm/siginfo.h> Christoph Hellwig
2017-06-03 19:00   ` Christoph Hellwig
2017-06-03 21:10   ` David Miller
2017-06-03 21:10     ` David Miller
2017-06-05  8:10   ` [tip:timers/core] sparc: Simplify <asm/siginfo.h> tip-bot for Christoph Hellwig
2017-06-03 19:00 ` [PATCH 2/5] ia64: remove HAVE_ARCH_COPY_SIGINFO Christoph Hellwig
2017-06-03 19:00   ` Christoph Hellwig
2017-06-05  8:10   ` [tip:timers/core] ia64: Remove HAVE_ARCH_COPY_SIGINFO tip-bot for Christoph Hellwig
2017-06-03 19:01 ` Christoph Hellwig [this message]
2017-06-03 19:01   ` [PATCH 3/5] posix-timers: move the do_schedule_next_timer declaration Christoph Hellwig
2017-06-05  8:11   ` [tip:timers/core] posix-timers: Move " tip-bot for Christoph Hellwig
2017-06-03 19:01 ` [PATCH 4/5] signal: move copy_siginfo_to_user to <linux/signal.h> Christoph Hellwig
2017-06-03 19:01   ` Christoph Hellwig
2017-06-05  8:12   ` [tip:timers/core] signal: Move " tip-bot for Christoph Hellwig
2017-06-03 19:01 ` [PATCH 5/5] remove non-uapi <asm/siginfo.h> Christoph Hellwig
2017-06-03 19:01   ` Christoph Hellwig
2017-06-04 13:13   ` Thomas Gleixner
2017-06-04 13:13     ` Thomas Gleixner
2017-06-05  7:18     ` Christoph Hellwig
2017-06-05  7:18       ` Christoph Hellwig
2017-06-05  8:00       ` Thomas Gleixner
2017-06-05  8:00         ` Thomas Gleixner
2017-06-05  8:12   ` [tip:timers/core] signal: Remove " tip-bot for Christoph Hellwig
2017-06-06 10:57 ` untangle the <asm/siginfo.h> mess Arnd Bergmann
2017-06-06 10:57   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170603190102.28866-4-hch@lst.de \
    --to=hch@lst.de \
    --cc=arnd@arndb.de \
    --cc=davem@davemloft.net \
    --cc=fenghua.yu@intel.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sparclinux@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.