lkml.org 
[lkml]   [2016]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 13/13] arm: Update arch_scale_cpu_capacity() to reflect change to define
    Date
    arch_scale_cpu_capacity() is no longer a weak function but a #define
    instead. Include the #define in topology.h.

    cc: Russell King <linux@arm.linux.org.uk>

    Signed-off-by: Morten Rasmussen <morten.rasmussen@arm.com>
    ---
    arch/arm/include/asm/topology.h | 5 +++++
    arch/arm/kernel/topology.c | 2 +-
    2 files changed, 6 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
    index 370f7a732900..a09a10599316 100644
    --- a/arch/arm/include/asm/topology.h
    +++ b/arch/arm/include/asm/topology.h
    @@ -24,6 +24,11 @@ void init_cpu_topology(void);
    void store_cpu_topology(unsigned int cpuid);
    const struct cpumask *cpu_coregroup_mask(int cpu);

    +#define arch_scale_cpu_capacity arm_arch_scale_cpu_capacity
    +struct sched_domain;
    +extern
    +unsigned long arm_arch_scale_cpu_capacity(struct sched_domain *sd, int cpu);
    +
    #else

    static inline void init_cpu_topology(void) { }
    diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
    index ab6d9c1835a4..cd7060c9e67d 100644
    --- a/arch/arm/kernel/topology.c
    +++ b/arch/arm/kernel/topology.c
    @@ -42,7 +42,7 @@
    */
    static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;

    -unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)
    +unsigned long arm_arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)
    {
    return per_cpu(cpu_scale, cpu);
    }
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-06-22 19:41    [W:4.168 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site