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 29/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/hotplug.h>
Date: Wed, 8 Feb 2017 19:39:31 +0100 [thread overview]
Message-ID: <1486579190-11717-30-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/hotplug.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/hotplug.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>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/arm/kernel/smp.c | 1 +
arch/arm64/include/asm/mmu_context.h | 1 +
arch/arm64/kernel/smp.c | 1 +
arch/ia64/kernel/process.c | 1 +
arch/metag/kernel/smp.c | 1 +
arch/mips/cavium-octeon/smp.c | 1 +
arch/mips/kernel/smp-bmips.c | 1 +
arch/mips/kernel/smp-cps.c | 1 +
arch/mips/loongson64/loongson-3/smp.c | 1 +
arch/powerpc/platforms/85xx/smp.c | 1 +
arch/powerpc/platforms/powermac/smp.c | 1 +
arch/powerpc/platforms/powernv/smp.c | 1 +
arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 +
arch/s390/kernel/smp.c | 1 +
arch/sh/kernel/smp.c | 1 +
arch/sparc/kernel/smp_64.c | 1 +
arch/x86/kernel/smpboot.c | 1 +
arch/xtensa/kernel/smp.c | 1 +
include/linux/sched/hotplug.h | 6 ++++++
kernel/cpu.c | 1 +
kernel/sched/core.c | 1 +
kernel/sched/sched.h | 4 +++-
22 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 7dd14e8395e6..cbad704bd8c8 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -12,6 +12,7 @@
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/interrupt.h>
#include <linux/cache.h>
#include <linux/profile.h>
diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h
index 0363fe80455c..c517c3c2f194 100644
--- a/arch/arm64/include/asm/mmu_context.h
+++ b/arch/arm64/include/asm/mmu_context.h
@@ -21,6 +21,7 @@
#include <linux/compiler.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <asm/cacheflush.h>
#include <asm/cpufeature.h>
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index cb87234cfcf2..1091a611e037 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -22,6 +22,7 @@
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/interrupt.h>
#include <linux/cache.h>
#include <linux/profile.h>
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 804b251ee5d1..2204ae450d65 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -21,6 +21,7 @@
#include <linux/personality.h>
#include <linux/sched.h>
#include <linux/sched/debug.h>
+#include <linux/sched/hotplug.h>
#include <linux/stddef.h>
#include <linux/thread_info.h>
#include <linux/unistd.h>
diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c
index bad13232de51..142707513ba3 100644
--- a/arch/metag/kernel/smp.c
+++ b/arch/metag/kernel/smp.c
@@ -13,6 +13,7 @@
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/interrupt.h>
#include <linux/cache.h>
#include <linux/profile.h>
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 256fe6f65cf2..7264ab69cd4c 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -11,6 +11,7 @@
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/module.h>
#include <asm/mmu_context.h>
diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
index 6d0f1321e084..a84785fbb6eb 100644
--- a/arch/mips/kernel/smp-bmips.c
+++ b/arch/mips/kernel/smp-bmips.c
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/mm.h>
#include <linux/delay.h>
#include <linux/smp.h>
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index 6183ad84cc73..06a674e23a99 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -12,6 +12,7 @@
#include <linux/io.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/slab.h>
#include <linux/smp.h>
#include <linux/types.h>
diff --git a/arch/mips/loongson64/loongson-3/smp.c b/arch/mips/loongson64/loongson-3/smp.c
index 99aab9f85904..987b774ec9c6 100644
--- a/arch/mips/loongson64/loongson-3/smp.c
+++ b/arch/mips/loongson64/loongson-3/smp.c
@@ -17,6 +17,7 @@
#include <linux/init.h>
#include <linux/cpu.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/smp.h>
#include <linux/cpufreq.h>
#include <asm/processor.h>
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index a83a6d26090d..078097a0b09d 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -12,6 +12,7 @@
#include <linux/stddef.h>
#include <linux/kernel.h>
+#include <linux/sched/hotplug.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/of.h>
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index c9eb7d6540ea..746ca7321b03 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -23,6 +23,7 @@
*/
#include <linux/kernel.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/smp.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
index c789258ae1e1..b15a2e08b31c 100644
--- a/arch/powerpc/platforms/powernv/smp.c
+++ b/arch/powerpc/platforms/powernv/smp.c
@@ -12,6 +12,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/smp.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index a1b63e00b2f7..7bc0e91f8715 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -24,6 +24,7 @@
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/sched.h> /* for idle_task_exit */
+#include <linux/sched/hotplug.h>
#include <linux/cpu.h>
#include <linux/of.h>
#include <linux/slab.h>
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index e49f61aadaf9..e6f29aae962b 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -31,6 +31,7 @@
#include <linux/irqflags.h>
#include <linux/cpu.h>
#include <linux/slab.h>
+#include <linux/sched/hotplug.h>
#include <linux/crash_dump.h>
#include <linux/memblock.h>
#include <asm/asm-offsets.h>
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 38e7860845db..a8c4d5785290 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -21,6 +21,7 @@
#include <linux/cpu.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/atomic.h>
#include <linux/clockchips.h>
#include <asm/processor.h>
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 0ce347f8e4cc..64e4acc9dd40 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -6,6 +6,7 @@
#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/sched.h>
+#include <linux/sched/hotplug.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/threads.h>
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 0fe89249d9ac..ab848319c17c 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -46,6 +46,7 @@
#include <linux/export.h>
#include <linux/sched.h>
#include <linux/sched/topology.h>
+#include <linux/sched/hotplug.h>
#include <linux/percpu.h>
#include <linux/bootmem.h>
#include <linux/err.h>
diff --git a/arch/xtensa/kernel/smp.c b/arch/xtensa/kernel/smp.c
index fc4ad21a5ed4..2b5a7ee12900 100644
--- a/arch/xtensa/kernel/smp.c
+++ b/arch/xtensa/kernel/smp.c
@@ -21,6 +21,7 @@
#include <linux/irq.h>
#include <linux/kdebug.h>
#include <linux/module.h>
+#include <linux/sched/hotplug.h>
#include <linux/reboot.h>
#include <linux/seq_file.h>
#include <linux/smp.h>
diff --git a/include/linux/sched/hotplug.h b/include/linux/sched/hotplug.h
new file mode 100644
index 000000000000..34670ed24894
--- /dev/null
+++ b/include/linux/sched/hotplug.h
@@ -0,0 +1,6 @@
+#ifndef _LINUX_SCHED_HOTPLUG_H
+#define _LINUX_SCHED_HOTPLUG_H
+
+#include <linux/sched.h>
+
+#endif /* _LINUX_SCHED_HOTPLUG_H */
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 0aae3183b029..78c206579d01 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -8,6 +8,7 @@
#include <linux/init.h>
#include <linux/notifier.h>
#include <linux/sched/signal.h>
+#include <linux/sched/hotplug.h>
#include <linux/unistd.h>
#include <linux/cpu.h>
#include <linux/oom.h>
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 4f29931aadba..0f1feae1579c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -9,6 +9,7 @@
#include <linux/sched/clock.h>
#include <uapi/linux/sched/types.h>
#include <linux/sched/loadavg.h>
+#include <linux/sched/hotplug.h>
#include <linux/cpuset.h>
#include <linux/delayacct.h>
#include <linux/init_task.h>
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index e1e819f731b2..0974eb2ef50d 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/deadline.h>
#include <linux/sched/clock.h>
#include <linux/sched/wake_q.h>
#include <linux/sched/signal.h>
@@ -12,8 +13,9 @@
#include <linux/sched/stat.h>
#include <linux/sched/nohz.h>
#include <linux/sched/debug.h>
+#include <linux/sched/hotplug.h>
+
#include <linux/u64_stats_sync.h>
-#include <linux/sched/deadline.h>
#include <linux/kernel_stat.h>
#include <linux/binfmts.h>
#include <linux/mutex.h>
--
2.7.4
next prev parent reply other threads:[~2017-02-08 18:59 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 ` [PATCH 03/48] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/wake_q.h> Ingo Molnar
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 ` Ingo Molnar [this message]
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-30-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.