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

Commit 55477eb4 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: fine-tune SD_SIBLING_INIT
  sched: fine-tune SD_MC_INIT
  sched: fix memory leak in a failure path
  sched: fix a bug in sched domain degenerate
parents 04774069 52c642f3

include/linux/topology.h

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void arch_update_cpu_topology(void); 
				| SD_BALANCE_FORK	\

				| SD_BALANCE_EXEC	\

				| SD_WAKE_AFFINE	\

				| SD_WAKE_IDLE		\

				| SD_WAKE_BALANCE	\

				| SD_SHARE_CPUPOWER,	\

	.last_balance		= jiffies,		\

	.balance_interval	= 1,			\
@@ -120,10 +120,10 @@ void arch_update_cpu_topology(void); 
	.wake_idx		= 1,			\

	.forkexec_idx		= 1,			\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_NEWIDLE	\

				| SD_BALANCE_FORK	\

				| SD_BALANCE_EXEC	\

				| SD_WAKE_AFFINE	\

				| SD_WAKE_BALANCE	\

				| SD_SHARE_PKG_RESOURCES\

				| BALANCE_FOR_MC_POWER,	\

	.last_balance		= jiffies,		\

kernel/sched.c

+5 −2
Original line number Diff line number Diff line
@@ -6877,15 +6877,17 @@ cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu) 
	struct sched_domain *tmp;



	/* Remove the sched domains which do not contribute to scheduling. */

	for (tmp = sd; tmp; tmp = tmp->parent) {

	for (tmp = sd; tmp; ) {

		struct sched_domain *parent = tmp->parent;

		if (!parent)

			break;



		if (sd_parent_degenerate(tmp, parent)) {

			tmp->parent = parent->parent;

			if (parent->parent)

				parent->parent->child = tmp;

		}

		} else

			tmp = tmp->parent;

	}



	if (sd && sd_degenerate(sd)) {
@@ -7674,6 +7676,7 @@ static int __build_sched_domains(const cpumask_t *cpu_map, 
error:

	free_sched_groups(cpu_map, tmpmask);

	SCHED_CPUMASK_FREE((void *)allmasks);

	kfree(rd);

	return -ENOMEM;

#endif

}