Commit 774a694f 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: (64 commits)
  sched: Fix sched::sched_stat_wait tracepoint field
  sched: Disable NEW_FAIR_SLEEPERS for now
  sched: Keep kthreads at default priority
  sched: Re-tune the scheduler latency defaults to decrease worst-case latencies
  sched: Turn off child_runs_first
  sched: Ensure that a child can't gain time over it's parent after fork()
  sched: enable SD_WAKE_IDLE
  sched: Deal with low-load in wake_affine()
  sched: Remove short cut from select_task_rq_fair()
  sched: Turn on SD_BALANCE_NEWIDLE
  sched: Clean up topology.h
  sched: Fix dynamic power-balancing crash
  sched: Remove reciprocal for cpu_power
  sched: Try to deal with low capacity, fix update_sd_power_savings_stats()
  sched: Try to deal with low capacity
  sched: Scale down cpu_power due to RT tasks
  sched: Implement dynamic cpu_power
  sched: Add smt_gain
  sched: Update the cpu_power sum during load-balance
  sched: Add SD_PREFER_SIBLING
  ...
parents 4f0ac854 e1f84508

arch/x86/include/asm/topology.h

+28 −19
Original line number Diff line number Diff line
@@ -140,12 +140,21 @@ extern unsigned long node_remap_size[]; 
	.newidle_idx		= SD_NEWIDLE_IDX,			\

	.wake_idx		= 1,					\

	.forkexec_idx		= SD_FORKEXEC_IDX,			\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_FORK	\

				| SD_WAKE_AFFINE	\

				| SD_WAKE_BALANCE	\

				| SD_SERIALIZE,		\

									\

	.flags			= 1*SD_LOAD_BALANCE			\

				| 1*SD_BALANCE_NEWIDLE			\

				| 1*SD_BALANCE_EXEC			\

				| 1*SD_BALANCE_FORK			\

				| 0*SD_WAKE_IDLE			\

				| 1*SD_WAKE_AFFINE			\

				| 1*SD_WAKE_BALANCE			\

				| 0*SD_SHARE_CPUPOWER			\

				| 0*SD_POWERSAVINGS_BALANCE		\

				| 0*SD_SHARE_PKG_RESOURCES		\

				| 1*SD_SERIALIZE			\

				| 1*SD_WAKE_IDLE_FAR			\

				| 0*SD_PREFER_SIBLING			\

				,					\

	.last_balance		= jiffies,				\

	.balance_interval	= 1,					\

}

fs/dcache.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/swap.h>

#include <linux/bootmem.h>

#include <linux/fs_struct.h>

#include <linux/hardirq.h>

#include "internal.h"



int sysctl_vfs_cache_pressure __read_mostly = 100;

fs/locks.c

+1 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) 
	 * give it the opportunity to lock the file.

	 */

	if (found)

		cond_resched_bkl();

		cond_resched();



find_conflict:

	for_each_lock(inode, before) {

include/linux/hardirq.h

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ 
#define HARDIRQ_OFFSET	(1UL << HARDIRQ_SHIFT)

#define NMI_OFFSET	(1UL << NMI_SHIFT)



#ifndef PREEMPT_ACTIVE

#define PREEMPT_ACTIVE_BITS	1

#define PREEMPT_ACTIVE_SHIFT	(NMI_SHIFT + NMI_BITS)

#define PREEMPT_ACTIVE	(__IRQ_MASK(PREEMPT_ACTIVE_BITS) << PREEMPT_ACTIVE_SHIFT)

#endif



#if PREEMPT_ACTIVE < (1 << (NMI_SHIFT + NMI_BITS))

#error PREEMPT_ACTIVE is too low!

#endif

include/linux/kernel.h

+3 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ extern int _cond_resched(void); 
#endif



#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP

  void __might_sleep(char *file, int line);

  void __might_sleep(char *file, int line, int preempt_offset);

/**

 * might_sleep - annotation for functions that can sleep

 *
@@ -137,8 +137,9 @@ extern int _cond_resched(void); 
 * supposed to.

 */

# define might_sleep() \

	do { __might_sleep(__FILE__, __LINE__); might_resched(); } while (0)

	do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)

#else

  static inline void __might_sleep(char *file, int line, int preempt_offset) { }

# define might_sleep() do { might_resched(); } while (0)

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE