diff options
-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) | |||
4846 | #endif | 4846 | #endif |
4847 | } | 4847 | } |
4848 | 4848 | ||
4849 | unsigned long get_parent_ip(unsigned long addr) | 4849 | notrace unsigned long get_parent_ip(unsigned long addr) |
4850 | { | 4850 | { |
4851 | if (in_lock_functions(addr)) { | 4851 | if (in_lock_functions(addr)) { |
4852 | addr = CALLER_ADDR2; | 4852 | addr = CALLER_ADDR2; |
@@ -7367,8 +7367,12 @@ static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level, | |||
7367 | cpumask_or(groupmask, groupmask, sched_group_cpus(group)); | 7367 | cpumask_or(groupmask, groupmask, sched_group_cpus(group)); |
7368 | 7368 | ||
7369 | cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group)); | 7369 | cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group)); |
7370 | printk(KERN_CONT " %s (__cpu_power = %d)", str, | 7370 | |
7371 | group->__cpu_power); | 7371 | printk(KERN_CONT " %s", str); |
7372 | if (group->__cpu_power != SCHED_LOAD_SCALE) { | ||
7373 | printk(KERN_CONT " (__cpu_power = %d)", | ||
7374 | group->__cpu_power); | ||
7375 | } | ||
7372 | 7376 | ||
7373 | group = group->next; | 7377 | group = group->next; |
7374 | } while (group != sd->groups); | 7378 | } while (group != sd->groups); |