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

Commit 9bfb52ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched 

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: clean up kernel/sched_stat.h
  sched: clean up overlong line in kernel/sched_debug.c
  sched: clean up, move __sched_text_start/end to sched.h
  sched: clean up sd_alloc_ctl_cpu_table() definition
  softlockup: fix false positives on CONFIG_NOHZ
parents c46f739d f95e0d1c

include/linux/sched.h

+4 −0
Original line number Diff line number Diff line
@@ -282,6 +282,10 @@ static inline void touch_all_softlockup_watchdogs(void) 


/* Attach to any functions which should be ignored in wchan output. */

#define __sched		__attribute__((__section__(".sched.text")))



/* Linker adds these: start and end of __sched functions */

extern char __sched_text_start[], __sched_text_end[];



/* Is this address in the __sched functions? */

extern int in_sched_functions(unsigned long addr);

kernel/sched.c

+1 −4
Original line number Diff line number Diff line
@@ -6708,9 +6708,6 @@ void __init sched_init_smp(void) 


int in_sched_functions(unsigned long addr)

{

	/* Linker adds these: start and end of __sched functions */

	extern char __sched_text_start[], __sched_text_end[];



	return in_lock_functions(addr) ||

		(addr >= (unsigned long)__sched_text_start

		&& addr < (unsigned long)__sched_text_end);

kernel/sched_debug.c

+5 −3
Original line number Diff line number Diff line
@@ -327,10 +327,12 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) 
			avg_atom = -1LL;



		avg_per_cpu = p->se.sum_exec_runtime;

		if (p->se.nr_migrations)

			avg_per_cpu = div64_64(avg_per_cpu, p->se.nr_migrations);

		else

		if (p->se.nr_migrations) {

			avg_per_cpu = div64_64(avg_per_cpu,

					       p->se.nr_migrations);

		} else {

			avg_per_cpu = -1LL;

		}



		__PN(avg_atom);

		__PN(avg_per_cpu);

kernel/sched_stats.h

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ static int show_schedstat(struct seq_file *seq, void *v) 
				    sd->lb_nobusyq[itype],

				    sd->lb_nobusyg[itype]);

			}

			seq_printf(seq, " %u %u %u %u %u %u %u %u %u %u %u %u\n",

			seq_printf(seq,

				   " %u %u %u %u %u %u %u %u %u %u %u %u\n",

			    sd->alb_count, sd->alb_failed, sd->alb_pushed,

			    sd->sbe_count, sd->sbe_balanced, sd->sbe_pushed,

			    sd->sbf_count, sd->sbf_balanced, sd->sbf_pushed,

kernel/time/tick-sched.c

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ void tick_nohz_update_jiffies(void) 
	if (!ts->tick_stopped)

		return;



	touch_softlockup_watchdog();



	cpu_clear(cpu, nohz_cpu_mask);

	now = ktime_get();