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

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

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

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
  sched: Use correct macro to display sched_child_runs_first in /proc/sched_debug
  sched: No need for bootmem special cases
  sched: Revert nohz_ratelimit() for now
  sched: Reduce update_group_power() calls
  sched: Update rq->clock for nohz balanced cpus
  sched: Fix spelling of sibling
  sched, cpuset: Drop __cpuexit from cpu hotplug callbacks
  sched: Fix the racy usage of thread_group_cputimer() in fastpath_timer_check()
  sched: run_posix_cpu_timers: Don't check ->exit_state, use lock_task_sighand()
  sched: thread_group_cputime: Simplify, document the "alive" check
  sched: Remove the obsolete exit_state/signal hacks
  sched: task_tick_rt: Remove the obsolete ->signal != NULL check
  sched: __sched_setscheduler: Read the RLIMIT_RTPRIO value lockless
  sched: Fix comments to make them DocBook happy
  sched: Fix fix_small_capacity
  powerpc: Exclude arch_sd_sibiling_asym_packing() on UP
  powerpc: Enable asymmetric SMT scheduling on POWER7
  sched: Add asymmetric group packing option for sibling domain
  sched: Fix capacity calculations for SMT4
  sched: Change nohz idle load balancing logic to push model
  ...
parents 4aed2fd8 0bcfe758

arch/parisc/kernel/ftrace.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ unsigned long ftrace_return_to_handler(unsigned long retval0, 
	unsigned long ret;



	pop_return_trace(&trace, &ret);

	trace.rettime = cpu_clock(raw_smp_processor_id());

	trace.rettime = local_clock();

	ftrace_graph_return(&trace);



	if (unlikely(!ret)) {
@@ -126,7 +126,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
		return;

	}



	calltime = cpu_clock(raw_smp_processor_id());

	calltime = local_clock();



	if (push_return_trace(old, calltime,

				self_addr, &trace.depth) == -EBUSY) {

arch/powerpc/include/asm/cputable.h

+2 −1
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ extern const char *powerpc_base_platform; 
#define CPU_FTR_SAO			LONG_ASM_CONST(0x0020000000000000)

#define CPU_FTR_CP_USE_DCBTZ		LONG_ASM_CONST(0x0040000000000000)

#define CPU_FTR_UNALIGNED_LD_STD	LONG_ASM_CONST(0x0080000000000000)

#define CPU_FTR_ASYM_SMT		LONG_ASM_CONST(0x0100000000000000)



#ifndef __ASSEMBLY__
@@ -412,7 +413,7 @@ extern const char *powerpc_base_platform; 
	    CPU_FTR_MMCRA | CPU_FTR_SMT | \

	    CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \

	    CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \

	    CPU_FTR_DSCR | CPU_FTR_SAO)

	    CPU_FTR_DSCR | CPU_FTR_SAO  | CPU_FTR_ASYM_SMT)

#define CPU_FTRS_CELL	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \

	    CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \

	    CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \

arch/powerpc/kernel/process.c

+11 −0
Original line number Diff line number Diff line
@@ -1299,3 +1299,14 @@ unsigned long randomize_et_dyn(unsigned long base) 


	return ret;

}



#ifdef CONFIG_SMP

int arch_sd_sibling_asym_packing(void)

{

	if (cpu_has_feature(CPU_FTR_ASYM_SMT)) {

		printk_once(KERN_INFO "Enabling Asymmetric SMT scheduling\n");

		return SD_ASYM_PACKING;

	}

	return 0;

}

#endif

include/linux/cpu.h

+25 −0
Original line number Diff line number Diff line
@@ -48,6 +48,31 @@ extern ssize_t arch_cpu_release(const char *, size_t); 
#endif

struct notifier_block;



/*

 * CPU notifier priorities.

 */

enum {

	/*

	 * SCHED_ACTIVE marks a cpu which is coming up active during

	 * CPU_ONLINE and CPU_DOWN_FAILED and must be the first

	 * notifier.  CPUSET_ACTIVE adjusts cpuset according to

	 * cpu_active mask right after SCHED_ACTIVE.  During

	 * CPU_DOWN_PREPARE, SCHED_INACTIVE and CPUSET_INACTIVE are

	 * ordered in the similar way.

	 *

	 * This ordering guarantees consistent cpu_active mask and

	 * migration behavior to all cpu notifiers.

	 */

	CPU_PRI_SCHED_ACTIVE	= INT_MAX,

	CPU_PRI_CPUSET_ACTIVE	= INT_MAX - 1,

	CPU_PRI_SCHED_INACTIVE	= INT_MIN + 1,

	CPU_PRI_CPUSET_INACTIVE	= INT_MIN,



	/* migration should happen before other stuff but after perf */

	CPU_PRI_PERF		= 20,

	CPU_PRI_MIGRATION	= 10,

};



#ifdef CONFIG_SMP

/* Need to know about CPUs going up/down? */

#if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)

include/linux/cpuset.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ extern int number_of_cpusets; /* How many cpusets are defined in system? */ 


extern int cpuset_init(void);

extern void cpuset_init_smp(void);

extern void cpuset_update_active_cpus(void);

extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);

extern int cpuset_cpus_allowed_fallback(struct task_struct *p);

extern nodemask_t cpuset_mems_allowed(struct task_struct *p);
@@ -132,6 +133,11 @@ static inline void set_mems_allowed(nodemask_t nodemask) 
static inline int cpuset_init(void) { return 0; }

static inline void cpuset_init_smp(void) {}



static inline void cpuset_update_active_cpus(void)

{

	partition_sched_domains(1, NULL, NULL);

}



static inline void cpuset_cpus_allowed(struct task_struct *p,

				       struct cpumask *mask)

{