Skip to contentSkip to conversation

recent sched.c broke cpu hotplug

DISCUSSION Ashok Raj 2 participants 2 messages Jun 23, 2005 – Jun 24, 2005

lore
Share & tools
lore

Ashok Raj

author
#0 lore raw

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.

Signature · 34 lines
Cheers,
Ashok Raj
- Open Source Technology Center


Some functions should be devinit for cpu hotplug purpose.

Signed-off-by: Ashok Raj <[email protected]>
-----------------------------------------------------
 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;
Acked-by
#1 lore raw
Quoted 5 lines · 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.

Ingo