[PATCH] x86: sched: fix for non SMP systems in sched.h

[PATCH] x86: sched: fix for non SMP systems in sched.h

[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.

Signed-off-by: Ralf Roesch <ralf.roesch@rw-gmbh.de>
---
 include/linux/sched.h |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 include/linux/sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
old mode 100644
new mode 100755
index c231a24..b633308
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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 */
 
 
-- 
1.6.5

Re: [PATCH] x86: sched: fix for non SMP systems in sched.h

[Ingo Molnar]

* Ralf R??sch <ralf.roesch@rw-gmbh.de> wrote:

> 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.
> 
> Signed-off-by: Ralf Roesch <ralf.roesch@rw-gmbh.de>
> ---
> include/linux/sched.h |    7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
> mode change 100644 => 100755 include/linux/sched.h
> 
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> old mode 100644
> new mode 100755
> index c231a24..b633308
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -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 */

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