diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 18:16:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 18:16:29 -0700 |
| commit | d06be221504189f38950111c214802ada0eb1b71 (patch) | |
| tree | bee2ed72066d8f517d86c2280cb450f249e0f12d /kernel | |
| parent | 4d831f53ddd5c0117ff40f841cf330c78d242e82 (diff) | |
| parent | 381512cf3d27f63f7a45b1bbe7d2d609c2ea3b74 (diff) | |
| download | linux-d06be221504189f38950111c214802ada0eb1b71.tar.gz linux-d06be221504189f38950111c214802ada0eb1b71.tar.bz2 linux-d06be221504189f38950111c214802ada0eb1b71.zip | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 5724508c3b66..b902e587a3a0 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -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); |