All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Mike Galbraith <efault@gmx.de>, Oleg Nesterov <oleg@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 03/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/wake_q.h>
Date: Wed,  8 Feb 2017 19:39:05 +0100	[thread overview]
Message-ID: <1486579190-11717-4-git-send-email-mingo@kernel.org> (raw)
In-Reply-To: <1486579190-11717-1-git-send-email-mingo@kernel.org>

We are going to split <linux/sched/wake_q.h> out of <linux/sched.h>, which
will have to be picked up from other headers and a couple of .c files.

Create a trivial placeholder <linux/sched/wake_q.h> file that just
maps to <linux/sched.h> to make this patch obviously correct and
bisectable.

Include the new header in the files that are going to need it.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 include/linux/sched/wake_q.h    | 6 ++++++
 ipc/mqueue.c                    | 1 +
 ipc/msg.c                       | 1 +
 ipc/sem.c                       | 1 +
 kernel/futex.c                  | 1 +
 kernel/locking/mutex.c          | 1 +
 kernel/locking/rtmutex.c        | 1 +
 kernel/locking/rtmutex_common.h | 1 +
 kernel/locking/rwsem-xadd.c     | 3 ++-
 kernel/sched/sched.h            | 1 +
 10 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/linux/sched/wake_q.h b/include/linux/sched/wake_q.h
new file mode 100644
index 000000000000..6383b35e4eba
--- /dev/null
+++ b/include/linux/sched/wake_q.h
@@ -0,0 +1,6 @@
+#ifndef _LINUX_SCHED_WAKE_Q_H
+#define _LINUX_SCHED_WAKE_Q_H
+
+#include <linux/sched.h>
+
+#endif /* _LINUX_SCHED_WAKE_Q_H */
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 7a2d8f0c8ae5..a604f1036067 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -35,6 +35,7 @@
 #include <linux/ipc_namespace.h>
 #include <linux/user_namespace.h>
 #include <linux/slab.h>
+#include <linux/sched/wake_q.h>
 
 #include <net/sock.h>
 #include "util.h"
diff --git a/ipc/msg.c b/ipc/msg.c
index e3e52ce01123..ecc387e573f6 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -31,6 +31,7 @@
 #include <linux/list.h>
 #include <linux/security.h>
 #include <linux/sched.h>
+#include <linux/sched/wake_q.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>
 #include <linux/seq_file.h>
diff --git a/ipc/sem.c b/ipc/sem.c
index 3ec5742b5640..c65dff526a9f 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -82,6 +82,7 @@
 #include <linux/rwsem.h>
 #include <linux/nsproxy.h>
 #include <linux/ipc_namespace.h>
+#include <linux/sched/wake_q.h>
 
 #include <linux/uaccess.h>
 #include "util.h"
diff --git a/kernel/futex.c b/kernel/futex.c
index 0842c8ca534b..e41472f33c73 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -61,6 +61,7 @@
 #include <linux/nsproxy.h>
 #include <linux/ptrace.h>
 #include <linux/sched/rt.h>
+#include <linux/sched/wake_q.h>
 #include <linux/hugetlb.h>
 #include <linux/freezer.h>
 #include <linux/bootmem.h>
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index ad2d9e22697b..57f6311e2405 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -21,6 +21,7 @@
 #include <linux/ww_mutex.h>
 #include <linux/sched.h>
 #include <linux/sched/rt.h>
+#include <linux/sched/wake_q.h>
 #include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index d340be3a488f..d4f798491361 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -15,6 +15,7 @@
 #include <linux/sched.h>
 #include <linux/sched/rt.h>
 #include <linux/sched/deadline.h>
+#include <linux/sched/wake_q.h>
 #include <linux/timer.h>
 
 #include "rtmutex_common.h"
diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
index 990134617b4c..856dfff5c33a 100644
--- a/kernel/locking/rtmutex_common.h
+++ b/kernel/locking/rtmutex_common.h
@@ -13,6 +13,7 @@
 #define __KERNEL_RTMUTEX_COMMON_H
 
 #include <linux/rtmutex.h>
+#include <linux/sched/wake_q.h>
 
 /*
  * This is the control structure for tasks blocked on a rt_mutex,
diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c
index 2ad8d8dc3bb1..4fe8d8ad4396 100644
--- a/kernel/locking/rwsem-xadd.c
+++ b/kernel/locking/rwsem-xadd.c
@@ -10,10 +10,11 @@
  * and Davidlohr Bueso <davidlohr@hp.com>. Based on mutexes.
  */
 #include <linux/rwsem.h>
-#include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/export.h>
+#include <linux/sched.h>
 #include <linux/sched/rt.h>
+#include <linux/sched/wake_q.h>
 #include <linux/osq_lock.h>
 
 #include "rwsem.h"
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 9b9cb260d9cf..683570739f46 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -3,6 +3,7 @@
 #include <linux/sched/sysctl.h>
 #include <linux/sched/topology.h>
 #include <linux/sched/rt.h>
+#include <linux/sched/wake_q.h>
 #include <linux/u64_stats_sync.h>
 #include <linux/sched/deadline.h>
 #include <linux/kernel_stat.h>
-- 
2.7.4

  parent reply	other threads:[~2017-02-08 19:11 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-08 18:39 [PATCH 00/48] sched.h modernization -v2, phase #2: "Prepare header dependencies" Ingo Molnar
2017-02-08 18:39 ` [PATCH 01/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/topology.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 02/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/idle.h> Ingo Molnar
2017-02-08 18:39 ` Ingo Molnar [this message]
2017-02-08 18:39 ` [PATCH 04/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 05/48] sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 06/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/loadavg.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 07/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/autogroup.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 08/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/mm.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 09/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/coredump.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 10/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 11/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/user.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 12/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/nmi.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 13/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/cpufreq.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 14/48] sched/headers: Prepare for new header dependencies before moving more code to <linux/sched/mm.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 15/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/numa_balancing.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 16/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/jobctl.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 17/48] sched/headers: Prepare header dependency changes, move the <asm/paravirt.h> include to kernel/sched/sched.h Ingo Molnar
2017-02-08 18:39 ` [PATCH 18/48] sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 19/48] sched/headers: Prepare for the removal of <asm/ptrace.h> " Ingo Molnar
2017-02-08 18:39 ` [PATCH 20/48] sched/headers: Prepare for the removal of <linux/rtmutex.h> " Ingo Molnar
2017-02-08 18:39 ` [PATCH 21/48] sched/headers: Prepare for the removal of various unrelated headers " Ingo Molnar
2017-02-08 18:39 ` [PATCH 22/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/xacct.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 23/48] sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 24/48] sched/headers: Prepare to move the memalloc_noio_*() APIs to <linux/sched/mm.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 25/48] sched/headers: Prepare to remove the <linux/gfp.h> include from <linux/sched.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 26/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/stat.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 27/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/nohz.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 28/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/debug.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 29/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/hotplug.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 30/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 31/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 32/48] sched/headers: Prepare to move the 'root_task_group' declaration to <linux/sched/autogroup.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 33/48] signals: Prepare to split out <linux/signal_types.h> from <linux/signal.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 34/48] sched/headers: Prepare for the reduction of <linux/sched.h>'s signal API dependency Ingo Molnar
2017-02-08 18:39 ` [PATCH 35/48] mm/headers, sched/headers: Prepare to split <linux/mm_types_task.h> out of <linux/mm_types.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 36/48] sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 37/48] sched/headers: Prepare to move 'init_task' and 'init_thread_union' from <linux/sched.h> to <linux/sched/task.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 38/48] sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 39/48] sched/headers: Prepare to move the task_lock()/unlock() APIs to <linux/sched/task.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 40/48] sched/headers: Prepare to move cputime functionality from <linux/sched.h> into <linux/sched/cputime.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 41/48] sched/headers: Prepare to move sched_info_on() and force_schedstat_enabled() from <linux/sched.h> to <linux/sched/stat.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 42/48] sched/headers, vfs/execve: Prepare to move the do_execve*() prototypes from <linux/sched.h> to <linux/binfmts.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 43/48] sched/headers: Prepare to move kstack_end() from <linux/sched.h> to <linux/sched/task_stack.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 44/48] sched/headers: Prepare to move exit_files() and exit_itimers() from <linux/sched.h> to <linux/sched/task.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 45/48] sched/headers: Prepare to move _init() prototypes from <linux/sched.h> to <linux/sched/init.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 46/48] sched/headers: Prepare to move the get_task_struct()/put_task_struct() and related APIs from <linux/sched.h> to <linux/sched/task.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 47/48] sched/headers: Prepare to remove the <linux/magic.h> include from <linux/sched/task_stack.h> Ingo Molnar
2017-02-08 18:39 ` [PATCH 48/48] sched/headers: Prepare to remove spurious <linux/sched.h> inclusion dependencies Ingo Molnar

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=1486579190-11717-4-git-send-email-mingo@kernel.org \
    --to=mingo@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=efault@gmx.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg@redhat.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /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.