Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d06be221 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

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
parents 4d831f53 381512cf

kernel/sched.c

+7 −3
Original line number Diff line number Diff line
@@ -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,



		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);