| Message ID | 1391017513-12995-7-git-send-email-nicolas.pitre@linaro.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Wed, Jan 29, 2014 at 12:45:13PM -0500, Nicolas Pitre wrote: > 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> > --- > kernel/Makefile | 1 - > kernel/cpu/Makefile | 1 - > kernel/sched/Makefile | 2 +- > kernel/{cpu => sched}/idle.c | 0 > 4 files changed, 1 insertion(+), 3 deletions(-) > delete mode 100644 kernel/cpu/Makefile > rename kernel/{cpu => sched}/idle.c (100%) > --- a/kernel/sched/Makefile > +++ b/kernel/sched/Makefile > @@ -11,7 +11,7 @@ ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) > CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer > endif > > -obj-y += core.o proc.o clock.o cputime.o idle_task.o fair.o rt.o stop_task.o > +obj-y += core.o proc.o clock.o cputime.o idle_task.o idle.o fair.o rt.o stop_task.o > obj-y += wait.o completion.o > obj-$(CONFIG_SMP) += cpupri.o > obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o > diff --git a/kernel/cpu/idle.c b/kernel/sched/idle.c > similarity index 100% > rename from kernel/cpu/idle.c > rename to kernel/sched/idle.c This is not a valid patch for PATCH(1). Please try again. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/kernel/Makefile b/kernel/Makefile index bc010ee272..6f1c7e5cfc 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -22,7 +22,6 @@ obj-y += sched/ obj-y += locking/ obj-y += power/ obj-y += printk/ -obj-y += cpu/ obj-y += irq/ obj-y += rcu/ diff --git a/kernel/cpu/Makefile b/kernel/cpu/Makefile deleted file mode 100644 index 59ab052ef7..0000000000 --- a/kernel/cpu/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y = idle.o diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile index 7b621409cf..ac3e0ea68f 100644 --- a/kernel/sched/Makefile +++ b/kernel/sched/Makefile @@ -11,7 +11,7 @@ ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer endif -obj-y += core.o proc.o clock.o cputime.o idle_task.o fair.o rt.o stop_task.o +obj-y += core.o proc.o clock.o cputime.o idle_task.o idle.o fair.o rt.o stop_task.o obj-y += wait.o completion.o obj-$(CONFIG_SMP) += cpupri.o obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
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> --- kernel/Makefile | 1 - kernel/cpu/Makefile | 1 - kernel/sched/Makefile | 2 +- kernel/{cpu => sched}/idle.c | 0 4 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 kernel/cpu/Makefile rename kernel/{cpu => sched}/idle.c (100%) diff --git a/kernel/cpu/idle.c b/kernel/sched/idle.c similarity index 100% rename from kernel/cpu/idle.c rename to kernel/sched/idle.c