scheduler fixes
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Gautham R Shenoy (1):
sched: Avoid printing sched_group::__cpu_power for default case
Lai Jiangshan (1):
tracing, sched: mark get_parent_ip() notrace
kernel/sched.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
kernel/sched.c +7 -3
@@ -4846,7 +4846,7 @@ void scheduler_tick(void)#endif } -unsigned long get_parent_ip (unsigned long addr) +notrace unsigned long get_parent_ip (unsigned long addr) {if (in_lock_functions (addr)) { addr =CALLER_ADDR2 ;
@@ -7367,8 +7367,12 @@ static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,cpumask_or (groupmask, groupmask,sched_group_cpus (group));cpulist_scnprintf (str,sizeof (str),sched_group_cpus (group)); -printk (KERN_CONT " %s (__cpu_power = %d)" , str, - group->__cpu_power); + +printk (KERN_CONT " %s" , str); +if (group->__cpu_power !=SCHED_LOAD_SCALE ) { +printk (KERN_CONT " (__cpu_power = %d)" , + group->__cpu_power); + } group = group->next; }while (group != sd->groups);