[PATCH] kernel/sched.c: whitespace cleanups (33859f7f) · Commits · 戴 / test

kernel/sched.c

+55 −40

Original line number	Diff line number	Diff line
		@@ -466,7 +466,8 @@ static int show_schedstat(struct seq_file seq, void v)
		seq_printf(seq, "domain%d %s", dcnt++, mask_str);
		for (itype = SCHED_IDLE; itype < MAX_IDLE_TYPES;
		itype++) {
		seq_printf(seq, " %lu %lu %lu %lu %lu %lu %lu %lu",
		seq_printf(seq, " %lu %lu %lu %lu %lu %lu %lu "
		"%lu",
		sd->lb_cnt[itype],
		sd->lb_balanced[itype],
		sd->lb_failed[itype],
		@@ -476,11 +477,13 @@ static int show_schedstat(struct seq_file seq, void v)
		sd->lb_nobusyq[itype],
		sd->lb_nobusyg[itype]);
		}
		seq_printf(seq, " %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu\n",
		seq_printf(seq, " %lu %lu %lu %lu %lu %lu %lu %lu %lu"
		" %lu %lu %lu\n",
		sd->alb_cnt, sd->alb_failed, sd->alb_pushed,
		sd->sbe_cnt, sd->sbe_balanced, sd->sbe_pushed,
		sd->sbf_cnt, sd->sbf_balanced, sd->sbf_pushed,
		sd->ttwu_wake_remote, sd->ttwu_move_affine, sd->ttwu_move_balance);
		sd->ttwu_wake_remote, sd->ttwu_move_affine,
		sd->ttwu_move_balance);
		}
		preempt_enable();
		#endif
		@@ -1454,7 +1457,9 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)

		if (this_sd->flags & SD_WAKE_AFFINE) {
		unsigned long tl = this_load;
		unsigned long tl_per_task = cpu_avg_load_per_task(this_cpu);
		unsigned long tl_per_task;

		tl_per_task = cpu_avg_load_per_task(this_cpu);

		/*
		* If sync wakeup then subtract the (maximum possible)
		@@ -2487,7 +2492,8 @@ small_imbalance:
		pwr_now /= SCHED_LOAD_SCALE;

		/* Amount of load we'd subtract */
		tmp = busiest_load_per_task*SCHED_LOAD_SCALE/busiest->cpu_power;
		tmp = busiest_load_per_task * SCHED_LOAD_SCALE /
		busiest->cpu_power;
		if (max_load > tmp)
		pwr_move += busiest->cpu_power *
		min(busiest_load_per_task, max_load - tmp);
		@@ -2497,8 +2503,10 @@ small_imbalance:
		busiest_load_per_task * SCHED_LOAD_SCALE)
		tmp = max_load * busiest->cpu_power / this->cpu_power;
		else
		tmp = busiest_load_per_task*SCHED_LOAD_SCALE/this->cpu_power;
		pwr_move += this->cpu_power*min(this_load_per_task, this_load + tmp);
		tmp = busiest_load_per_task * SCHED_LOAD_SCALE /
		this->cpu_power;
		pwr_move += this->cpu_power *
		min(this_load_per_task, this_load + tmp);
		pwr_move /= SCHED_LOAD_SCALE;

		/* Move if we gain throughput */
		@@ -3366,7 +3374,8 @@ void fastcall add_preempt_count(int val)
		/*
		* Spinlock count overflowing soon?
		*/
		DEBUG_LOCKS_WARN_ON((preempt_count() & PREEMPT_MASK) >= PREEMPT_MASK-10);
		DEBUG_LOCKS_WARN_ON((preempt_count() & PREEMPT_MASK) >=
		PREEMPT_MASK - 10);
		}
		EXPORT_SYMBOL(add_preempt_count);

		@@ -5439,16 +5448,19 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu)
		if (!(sd->flags & SD_LOAD_BALANCE)) {
		printk("does not load-balance\n");
		if (sd->parent)
		printk(KERN_ERR "ERROR: !SD_LOAD_BALANCE domain has parent");
		printk(KERN_ERR "ERROR: !SD_LOAD_BALANCE domain"
		" has parent");
		break;
		}

		printk("span %s\n", str);

		if (!cpu_isset(cpu, sd->span))
		printk(KERN_ERR "ERROR: domain->span does not contain CPU%d\n", cpu);
		printk(KERN_ERR "ERROR: domain->span does not contain "
		"CPU%d\n", cpu);
		if (!cpu_isset(cpu, group->cpumask))
		printk(KERN_ERR "ERROR: domain->groups does not contain CPU%d\n", cpu);
		printk(KERN_ERR "ERROR: domain->groups does not contain"
		" CPU%d\n", cpu);

		printk(KERN_DEBUG);
		for (i = 0; i < level + 2; i++)
		@@ -5463,7 +5475,8 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu)

		if (!group->cpu_power) {
		printk("\n");
		printk(KERN_ERR "ERROR: domain->cpu_power not set\n");
		printk(KERN_ERR "ERROR: domain->cpu_power not "
		"set\n");
		}

		if (!cpus_weight(group->cpumask)) {
		@@ -5486,15 +5499,17 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu)
		printk("\n");

		if (!cpus_equal(sd->span, groupmask))
		printk(KERN_ERR "ERROR: groups don't span domain->span\n");
		printk(KERN_ERR "ERROR: groups don't span "
		"domain->span\n");

		level++;
		sd = sd->parent;
		if (!sd)
		continue;

		if (sd) {
		if (!cpus_subset(groupmask, sd->span))
		printk(KERN_ERR "ERROR: parent span is not a superset of domain->span\n");
		}
		printk(KERN_ERR "ERROR: parent span is not a superset "
		"of domain->span\n");

		} while (sd);
		}
		@@ -5812,8 +5827,9 @@ __setup("max_cache_size=", setup_max_cache_size);
		*/
		static void touch_cache(void *__cache, unsigned long __size)
		{
		unsigned long size = __size/sizeof(long), chunk1 = size/3,
		chunk2 = 2*size/3;
		unsigned long size = __size / sizeof(long);
		unsigned long chunk1 = size / 3;
		unsigned long chunk2 = 2 * size / 3;
		unsigned long *cache = __cache;
		int i;

		@@ -6009,7 +6025,8 @@ static unsigned long long measure_migration_cost(int cpu1, int cpu2)
		avg_fluct = (avg_fluct + fluct)/2;

		if (migration_debug)
		printk("-> [%d][%d][%7d] %3ld.%ld [%3ld.%ld] (%ld): (%8Ld %8Ld)\n",
		printk("-> [%d][%d][%7d] %3ld.%ld [%3ld.%ld] (%ld): "
		"(%8Ld %8Ld)\n",
		cpu1, cpu2, size,
		(long)cost / 1000000,
		((long)cost / 100000) % 10,
		@@ -6104,8 +6121,7 @@ static void calibrate_migration_costs(const cpumask_t *cpu_map)
		-1
		#endif
		);
		if (system_state == SYSTEM_BOOTING) {
		if (num_online_cpus() > 1) {
		if (system_state == SYSTEM_BOOTING && num_online_cpus() > 1) {
		printk("migration_cost=");
		for (distance = 0; distance <= max_distance; distance++) {
		if (distance)
		@@ -6114,7 +6130,6 @@ static void calibrate_migration_costs(const cpumask_t *cpu_map)
		}
		printk("\n");
		}
		}
		j1 = jiffies;
		if (migration_debug)
		printk("migration: %ld seconds\n", (j1-j0) / HZ);

Admin message