2013-03-21 22:02:57

by Thomas Gleixner

[permalink] [raw]
Subject: [patch 04/34] idle: Provide a generic entry point for the idle code

For now this calls cpu_idle(), but in the long run we want to move the
cpu bringup code to the core and therefor we add a state argument.

Signed-off-by: Thomas Gleixner <[email protected]>
---
include/linux/cpu.h | 8 ++++++++
init/main.c | 2 +-
kernel/Makefile | 1 +
kernel/cpu/Makefile | 1 +
kernel/cpu/idle.c | 10 ++++++++++
5 files changed, 21 insertions(+), 1 deletion(-)

Index: linux-2.6/include/linux/cpu.h
===================================================================
--- linux-2.6.orig/include/linux/cpu.h
+++ linux-2.6/include/linux/cpu.h
@@ -212,4 +212,12 @@ static inline int disable_nonboot_cpus(v
static inline void enable_nonboot_cpus(void) {}
#endif /* !CONFIG_PM_SLEEP_SMP */

+enum cpuhp_state {
+ CPUHP_OFFLINE,
+ CPUHP_ONLINE,
+};
+
+void cpu_startup_entry(enum cpuhp_state state);
+void cpu_idle(void);
+
#endif /* _LINUX_CPU_H_ */
Index: linux-2.6/init/main.c
===================================================================
--- linux-2.6.orig/init/main.c
+++ linux-2.6/init/main.c
@@ -384,7 +384,7 @@ static noinline void __init_refok rest_i
init_idle_bootup_task(current);
schedule_preempt_disabled();
/* Call into cpu_idle with preempt disabled */
- cpu_idle();
+ cpu_startup_entry(CPUHP_ONLINE);
}

/* Check for early params. */
Index: linux-2.6/kernel/Makefile
===================================================================
--- linux-2.6.orig/kernel/Makefile
+++ linux-2.6/kernel/Makefile
@@ -24,6 +24,7 @@ endif

obj-y += sched/
obj-y += power/
+obj-y += cpu/

obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
Index: linux-2.6/kernel/cpu/Makefile
===================================================================
--- /dev/null
+++ linux-2.6/kernel/cpu/Makefile
@@ -0,0 +1 @@
+obj-y = idle.o
Index: linux-2.6/kernel/cpu/idle.c
===================================================================
--- /dev/null
+++ linux-2.6/kernel/cpu/idle.c
@@ -0,0 +1,10 @@
+/*
+ * Generic entry point for the idle threads
+ */
+#include <linux/sched.h>
+#include <linux/cpu.h>
+
+void cpu_startup_entry(enum cpuhp_state state)
+{
+ cpu_idle();
+}


Subject: [tip:smp/hotplug] idle: Provide a generic entry point for the idle code

Commit-ID: a1a04ec3c7c27a682473fd9beb2c996316a64649
Gitweb: http://git.kernel.org/tip/a1a04ec3c7c27a682473fd9beb2c996316a64649
Author: Thomas Gleixner <[email protected]>
AuthorDate: Thu, 21 Mar 2013 22:49:34 +0100
Committer: Thomas Gleixner <[email protected]>
CommitDate: Mon, 8 Apr 2013 17:39:23 +0200

idle: Provide a generic entry point for the idle code

For now this calls cpu_idle(), but in the long run we want to move the
cpu bringup code to the core and therefor we add a state argument.

Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: Paul McKenney <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Reviewed-by: Cc: Srivatsa S. Bhat <[email protected]>
Cc: Magnus Damm <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
---
include/linux/cpu.h | 8 ++++++++
init/main.c | 2 +-
kernel/Makefile | 1 +
kernel/cpu/Makefile | 1 +
kernel/cpu/idle.c | 10 ++++++++++
5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index ce7a074..7419e30 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -212,4 +212,12 @@ static inline int disable_nonboot_cpus(void) { return 0; }
static inline void enable_nonboot_cpus(void) {}
#endif /* !CONFIG_PM_SLEEP_SMP */

+enum cpuhp_state {
+ CPUHP_OFFLINE,
+ CPUHP_ONLINE,
+};
+
+void cpu_startup_entry(enum cpuhp_state state);
+void cpu_idle(void);
+
#endif /* _LINUX_CPU_H_ */
diff --git a/init/main.c b/init/main.c
index 63534a1..adb179d 100644
--- a/init/main.c
+++ b/init/main.c
@@ -384,7 +384,7 @@ static noinline void __init_refok rest_init(void)
init_idle_bootup_task(current);
schedule_preempt_disabled();
/* Call into cpu_idle with preempt disabled */
- cpu_idle();
+ cpu_startup_entry(CPUHP_ONLINE);
}

/* Check for early params. */
diff --git a/kernel/Makefile b/kernel/Makefile
index bbde5f1..d1574d4 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -24,6 +24,7 @@ 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
new file mode 100644
index 0000000..59ab052
--- /dev/null
+++ b/kernel/cpu/Makefile
@@ -0,0 +1 @@
+obj-y = idle.o
diff --git a/kernel/cpu/idle.c b/kernel/cpu/idle.c
new file mode 100644
index 0000000..1908f00
--- /dev/null
+++ b/kernel/cpu/idle.c
@@ -0,0 +1,10 @@
+/*
+ * Generic entry point for the idle threads
+ */
+#include <linux/sched.h>
+#include <linux/cpu.h>
+
+void cpu_startup_entry(enum cpuhp_state state)
+{
+ cpu_idle();
+}

2013-04-14 00:42:56

by Yinghai Lu

[permalink] [raw]
Subject: Re: [tip:smp/hotplug] idle: Provide a generic entry point for the idle code

On Mon, Apr 8, 2013 at 1:12 PM, tip-bot for Thomas Gleixner
<[email protected]> wrote:
> Commit-ID: a1a04ec3c7c27a682473fd9beb2c996316a64649
> Gitweb: http://git.kernel.org/tip/a1a04ec3c7c27a682473fd9beb2c996316a64649
> Author: Thomas Gleixner <[email protected]>
> AuthorDate: Thu, 21 Mar 2013 22:49:34 +0100
> Committer: Thomas Gleixner <[email protected]>
> CommitDate: Mon, 8 Apr 2013 17:39:23 +0200
>
> idle: Provide a generic entry point for the idle code
>
> For now this calls cpu_idle(), but in the long run we want to move the
> cpu bringup code to the core and therefor we add a state argument.
>
> Signed-off-by: Thomas Gleixner <[email protected]>
...
> Reviewed-by: Cc: Srivatsa S. Bhat <[email protected]>

What is that ?

looks your scripts has problem to convert Cc to Reviewed-by

Yinghai