aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2014-01-26 23:42:01 -0500
committerMoyster <oysterized@gmail.com>2017-12-05 18:06:10 +0100
commit5084d13c2a2919bbcdafb5868241673ce83459fc (patch)
tree005771e8b155e83521035fb6888f4fbbc059e61d
parentb92b53b5a51b7402c36942cbfbde58701d87cdb7 (diff)
sched/idle: Move cpu/idle.c to sched/idle.c
Integration of cpuidle with the scheduler requires that the idle loop be closely integrated with the scheduler proper. Moving cpu/idle.c into the sched directory will allow for a smoother integration, and eliminate a subdirectory which contained only one source file. Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/alpine.LFD.2.11.1401301102210.1652@knanqh.ubzr Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--kernel/Makefile1
-rw-r--r--kernel/cpu/Makefile1
-rw-r--r--kernel/sched/Makefile1
-rw-r--r--kernel/sched/idle.c (renamed from kernel/cpu/idle.c)0
4 files changed, 1 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 271fd3119..5a51e6c71 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -24,7 +24,6 @@ endif
obj-y += sched/
obj-y += power/
-obj-y += cpu/
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
diff --git a/kernel/cpu/Makefile b/kernel/cpu/Makefile
deleted file mode 100644
index 59ab052ef..000000000
--- a/kernel/cpu/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y = idle.o
diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
index deaf90e4a..078c9feb3 100644
--- a/kernel/sched/Makefile
+++ b/kernel/sched/Makefile
@@ -12,6 +12,7 @@ CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer
endif
obj-y += core.o clock.o cputime.o idle_task.o fair.o rt.o stop_task.o
+obj-y += idle.o
obj-$(CONFIG_SMP) += cpupri.o
obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
obj-$(CONFIG_SCHEDSTATS) += stats.o
diff --git a/kernel/cpu/idle.c b/kernel/sched/idle.c
index c378dc659..c378dc659 100644
--- a/kernel/cpu/idle.c
+++ b/kernel/sched/idle.c