recent sched.c broke cpu hotplug

recent sched.c broke cpu hotplug

[Ashok Raj]

Hi Andrew

trivial fix, this is required for getting cpu hotplug to work. These
functions are called during cpu down, but marked __init instead of __devinit.


-- 
Cheers,
Ashok Raj
- Open Source Technology Center


Some functions should be devinit for cpu hotplug purpose.

Signed-off-by: Ashok Raj <ashok.raj@intel.com>
-----------------------------------------------------
 kernel/sched.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.12-mm1/kernel/sched.c
===================================================================
--- linux-2.6.12-mm1.orig/kernel/sched.c
+++ linux-2.6.12-mm1/kernel/sched.c
@@ -5207,7 +5207,7 @@ __setup("migration_factor=", setup_migra
  * Estimated distance of two CPUs, measured via the number of domains
  * we have to pass for the two CPUs to be in the same span:
  */
-__init static unsigned long domain_distance(int cpu1, int cpu2)
+__devinit static unsigned long domain_distance(int cpu1, int cpu2)
 {
 	unsigned long distance = 0;
 	struct sched_domain *sd;
@@ -5417,7 +5417,7 @@ measure_cost(int cpu1, int cpu2, void *c
 	return cost1 - cost2;
 }
 
-__init static unsigned long long measure_migration_cost(int cpu1, int cpu2)
+__devinit static unsigned long long measure_migration_cost(int cpu1, int cpu2)
 {
 	unsigned long long max_cost = 0, fluct = 0, avg_fluct = 0;
 	unsigned int max_size, size, size_found = 0;

Re: recent sched.c broke cpu hotplug

[Ingo Molnar]

* Ashok Raj <ashok.raj@intel.com> wrote:

> Hi Andrew
> 
> trivial fix, this is required for getting cpu hotplug to work. These 
> functions are called during cpu down, but marked __init instead of 
> __devinit.

Acked-by: Ingo Molnar <mingo@elte.hu>

	Ingo