1 files changed, 22 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 33b9b4841ee7..2e490271acf6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -681,7 +681,7 @@ enum cpu_idle_type {
 #define SCHED_LOAD_SHIFT        10
 #define SCHED_LOAD_SCALE        (1L << SCHED_LOAD_SHIFT)
-#define SCHED_LOAD_SCALE_FUZZ   (SCHED_LOAD_SCALE >> 5)
+#define SCHED_LOAD_SCALE_FUZZ   (SCHED_LOAD_SCALE >> 1)
 #ifdef CONFIG_SMP
 #define SD_LOAD_BALANCE         1       /* Do load balancing on this domain. */
@@ -786,6 +786,22 @@ extern int partition_sched_domains(cpumask_t *partition1,
 #endif  /* CONFIG_SMP */
+/*
+ * A runqueue laden with a single nice 0 task scores a weighted_cpuload of
+ * SCHED_LOAD_SCALE. This function returns 1 if any cpu is laden with a
+ * task of nice 0 or enough lower priority tasks to bring up the
+ * weighted_cpuload
+ */
+static inline int above_background_load(void)
+{
+        unsigned long cpu;
+        for_each_online_cpu(cpu) {
+                if (weighted_cpuload(cpu) >= SCHED_LOAD_SCALE)
+                        return 1;
+        }
+        return 0;
+}
 struct io_context;                      /* See blkdev.h */
 struct cpuset;
@@ -935,6 +951,11 @@ struct task_struct {
        struct sched_class *sched_class;
        struct sched_entity se;
+#ifdef CONFIG_PREEMPT_NOTIFIERS
+        /* list of struct preempt_notifier: */
+        struct hlist_head preempt_notifiers;
+#endif
        unsigned short ioprio;
 #ifdef CONFIG_BLK_DEV_IO_TRACE
        unsigned int btrace_seq;

diff --git a/include/linux/sched.h b/include/linux/sched.h index 33b9b4841ee7..2e490271acf6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h
@@ -681,7 +681,7 @@ enum cpu_idle_type {
681	#define SCHED_LOAD_SHIFT 10	681	#define SCHED_LOAD_SHIFT 10
682	#define SCHED_LOAD_SCALE (1L << SCHED_LOAD_SHIFT)	682	#define SCHED_LOAD_SCALE (1L << SCHED_LOAD_SHIFT)
683		683
684	#define SCHED_LOAD_SCALE_FUZZ (SCHED_LOAD_SCALE >> 5)	684	#define SCHED_LOAD_SCALE_FUZZ (SCHED_LOAD_SCALE >> 1)
685		685
686	#ifdef CONFIG_SMP	686	#ifdef CONFIG_SMP
687	#define SD_LOAD_BALANCE 1 /* Do load balancing on this domain. */	687	#define SD_LOAD_BALANCE 1 /* Do load balancing on this domain. */
@@ -786,6 +786,22 @@ extern int partition_sched_domains(cpumask_t *partition1,
786		786
787	#endif /* CONFIG_SMP */	787	#endif /* CONFIG_SMP */
788		788
		789	/*
		790	* A runqueue laden with a single nice 0 task scores a weighted_cpuload of
		791	* SCHED_LOAD_SCALE. This function returns 1 if any cpu is laden with a
		792	* task of nice 0 or enough lower priority tasks to bring up the
		793	* weighted_cpuload
		794	*/
		795	static inline int above_background_load(void)
		796	{
		797	unsigned long cpu;
		798
		799	for_each_online_cpu(cpu) {
		800	if (weighted_cpuload(cpu) >= SCHED_LOAD_SCALE)
		801	return 1;
		802	}
		803	return 0;
		804	}
789		805
790	struct io_context; /* See blkdev.h */	806	struct io_context; /* See blkdev.h */
791	struct cpuset;	807	struct cpuset;
@@ -935,6 +951,11 @@ struct task_struct {
935	struct sched_class *sched_class;	951	struct sched_class *sched_class;
936	struct sched_entity se;	952	struct sched_entity se;
937		953
		954	#ifdef CONFIG_PREEMPT_NOTIFIERS
		955	/* list of struct preempt_notifier: */
		956	struct hlist_head preempt_notifiers;
		957	#endif
		958
938	unsigned short ioprio;	959	unsigned short ioprio;
939	#ifdef CONFIG_BLK_DEV_IO_TRACE	960	#ifdef CONFIG_BLK_DEV_IO_TRACE
940	unsigned int btrace_seq;	961	unsigned int btrace_seq;