diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 827cd9a..b94a6de 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -760,6 +760,16 @@ static void do_rebuild_sched_domains(struct work_struct *unused) ndoms = generate_sched_domains(&doms, &attr); cgroup_unlock(); + printk(KERN_INFO "cpusets: rebuild ndoms %u\n", ndoms); + if (doms) { + char str[128]; + int i; + for (i=0; i < ndoms; i++) { + cpumask_scnprintf(str, sizeof(str), *(doms + i)); + printk(KERN_INFO "cpuset: domain %u cpumask %s\n", i, str); + } + } + /* Have scheduler rebuild the domains */ partition_sched_domains(ndoms, doms, attr); diff --git a/kernel/sched.c b/kernel/sched.c index ad1962d..7833224 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -6647,11 +6647,16 @@ static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level, return 0; } -static void sched_domain_debug(struct sched_domain *sd, int cpu) +static void sched_domain_debug(struct root_domain *rd, struct sched_domain *sd, int cpu) { cpumask_t *groupmask; int level = 0; + if (rd == &def_root_domain) + printk(KERN_DEBUG "CPU%d root domain default\n", cpu); + else + printk(KERN_DEBUG "CPU%d root domain %p\n", cpu, rd); + if (!sd) { printk(KERN_DEBUG "CPU%d attaching NULL sched-domain.\n", cpu); return; @@ -6676,7 +6681,7 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu) kfree(groupmask); } #else /* !CONFIG_SCHED_DEBUG */ -# define sched_domain_debug(sd, cpu) do { } while (0) +# define sched_domain_debug(rd, sd, cpu) do { } while (0) #endif /* CONFIG_SCHED_DEBUG */ static int sd_degenerate(struct sched_domain *sd) @@ -6819,7 +6824,7 @@ cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu) sd->child = NULL; } - sched_domain_debug(sd, cpu); + sched_domain_debug(rd, sd, cpu); rq_attach_root(rq, rd); rcu_assign_pointer(rq->sd, sd);