Skip to contentSkip to conversation

x86: sched: fix for non SMP systems in sched.h

PATCH In review Ralf Rösch 2 participants 2 messages Oct 30, 2009 – Nov 8, 2009 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: sched: fix for non SMP systems in sched.h

commit d65d153bc23b84e4709a49137a9a03ae139d51a0 introduced
two new prototypes: default_scale_freq_power and default_scale_smt_power. Both of them use struct sched_domain which is not defined on non SMP systems. Just moved the prototypes to the correct place.

---
include/linux/sched.h | 7 +++----

1 files changed, 3 insertions(+), 4 deletions(-)

mode change 100644 => 100755 include/linux/sched.h

include/linux/sched.h +0 -0
old mode 100644
new mode 100755
index c231a24..b633308
@@ -1036,6 +1036,9 @@ static inline int test_sd_parent(struct sched_domain *sd, int flag)
    return 0;

}

+unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu); +unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu); +
#else /* CONFIG_SMP */

struct sched_domain_attr;
@@ -1047,10 +1050,6 @@ partition_sched_domains(int ndoms_new, struct cpumask *doms_new, }
#endif /* !CONFIG_SMP */

-
-unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu); -unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu); -
struct io_context; /* See blkdev.h */

Signature · 1 line
1.6.5
#1 lore raw
Quoted 38 lines · Ralf R??sch

commit d65d153bc23b84e4709a49137a9a03ae139d51a0 introduced two new prototypes: default_scale_freq_power and default_scale_smt_power. Both of them use struct sched_domain which is not defined on non SMP systems.
Just moved the prototypes to the correct place.

---
include/linux/sched.h | 7 +++----

1 files changed, 3 insertions(+), 4 deletions(-)

mode change 100644 => 100755 include/linux/sched.h

include/linux/sched.h +3 -0
old mode 100644
new mode 100755
index c231a24..b633308
@@ -1036,6 +1036,9 @@ static inline int test_sd_parent(struct
 sched_domain *sd, int flag)
    return 0;
 }
 
+unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu);
+unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu);
+
 #else /* CONFIG_SMP */
 

struct sched_domain_attr;

include/linux/sched.h +0 -4
@@ -1047,10 +1050,6 @@ partition_sched_domains(int ndoms_new, struct
 cpumask *doms_new,
 }
 #endif    /* !CONFIG_SMP */
 
-
-unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu);
-unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu);
-
Quoted 1 line

struct io_context; /* See blkdev.h */

FYI, your patch has tabs converted to spaces (and line-wrap problems), so it wont apply cleanly.

See Documentation/email-clients.txt about how to send patches without such problems.

Thanks,

Ingo