lkml.org 
[lkml]   [2008]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] Revert "[PATCH] sched: remove cache_hot_time"
    Date
    This reverts commit 362a7016637648c6aefc98b706298baedfaa1543.

    Signed-off-by: Gregory Haskins <ghaskins@novell.com>
    ---

    include/linux/sched.h | 1 +
    include/linux/topology.h | 1 +
    kernel/sched.c | 8 +++++---
    3 files changed, 7 insertions(+), 3 deletions(-)

    diff --git a/include/linux/sched.h b/include/linux/sched.h
    index cfb0d87..5619f3c 100644
    --- a/include/linux/sched.h
    +++ b/include/linux/sched.h
    @@ -777,6 +777,7 @@ struct sched_domain {
    unsigned long max_interval; /* Maximum balance interval ms */
    unsigned int busy_factor; /* less balancing by factor if busy */
    unsigned int imbalance_pct; /* No balance until over watermark */
    + unsigned long long cache_hot_time; /* Task considered cache hot (ns) */
    unsigned int cache_nice_tries; /* Leave cache hot tasks for # tries */
    unsigned int busy_idx;
    unsigned int idle_idx;
    diff --git a/include/linux/topology.h b/include/linux/topology.h
    index 2158fc0..f6a7928 100644
    --- a/include/linux/topology.h
    +++ b/include/linux/topology.h
    @@ -162,6 +162,7 @@ void arch_update_cpu_topology(void);
    .max_interval = 64*num_online_cpus(), \
    .busy_factor = 128, \
    .imbalance_pct = 133, \
    + .cache_hot_time = (10*1000000), \
    .cache_nice_tries = 1, \
    .busy_idx = 3, \
    .idle_idx = 3, \
    diff --git a/kernel/sched.c b/kernel/sched.c
    index 9a1ddb8..0ca5218 100644
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -6223,7 +6223,7 @@ set_table_entry(struct ctl_table *entry,
    static struct ctl_table *
    sd_alloc_ctl_domain_table(struct sched_domain *sd)
    {
    - struct ctl_table *table = sd_alloc_ctl_entry(12);
    + struct ctl_table *table = sd_alloc_ctl_entry(13);

    if (table == NULL)
    return NULL;
    @@ -6249,9 +6249,11 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
    set_table_entry(&table[9], "cache_nice_tries",
    &sd->cache_nice_tries,
    sizeof(int), 0644, proc_dointvec_minmax);
    - set_table_entry(&table[10], "flags", &sd->flags,
    + set_table_entry(&table[10], "cache_hot_time", &sd->cache_hot_time,
    + sizeof(long long), 0644, proc_doulongvec_minmax);
    + set_table_entry(&table[11], "flags", &sd->flags,
    sizeof(int), 0644, proc_dointvec_minmax);
    - /* &table[11] is terminator */
    + /* &table[12] is terminator */

    return table;
    }


    \
     
     \ /
      Last update: 2008-09-04 15:55    [W:0.023 / U:61.600 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site