leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Avoid printing sched_group::__cpu_power for default case
  tracing, sched: mark get_parent_ip() notrace
This commit is contained in:
Linus Torvalds 2009-04-16 18:16:29 -07:00
commit d06be22150
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/sched.c
View File

@ -4846,7 +4846,7 @@ void scheduler_tick(void)
#endif #endif
} }
unsigned long get_parent_ip(unsigned long addr) notrace unsigned long get_parent_ip(unsigned long addr)
{ {
if (in_lock_functions(addr)) { if (in_lock_functions(addr)) {
addr = CALLER_ADDR2; 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)); cpumask_or(groupmask, groupmask, sched_group_cpus(group));
cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group)); cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group));
printk(KERN_CONT " %s (__cpu_power = %d)", str,
printk(KERN_CONT " %s", str);
if (group->__cpu_power != SCHED_LOAD_SCALE) {
printk(KERN_CONT " (__cpu_power = %d)",
group->__cpu_power); group->__cpu_power);
}
group = group->next; group = group->next;
} while (group != sd->groups); } while (group != sd->groups);