1 files changed, 54 insertions, 32 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 75e6e60bf583..244c287a5ac1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -145,7 +145,6 @@ extern unsigned long this_cpu_load(void);
 
 
 extern void calc_global_load(void);
-extern u64 cpu_nr_migrations(int cpu);
 
 extern unsigned long get_parent_ip(unsigned long addr);
 
@@ -171,8 +170,6 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 }
 #endif
 
-extern unsigned long long time_sync_thresh;
-
 /*
  * Task state bitmask. NOTE! These bits are also
  * encoded in fs/proc/array.c: get_task_state().
@@ -349,7 +346,6 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
-asmlinkage void __schedule(void);
 asmlinkage void schedule(void);
 extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
 
@@ -628,6 +624,9 @@ struct signal_struct {
         cputime_t utime, stime, cutime, cstime;
         cputime_t gtime;
         cputime_t cgtime;
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+        cputime_t prev_utime, prev_stime;
+#endif
         unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
         unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
         unsigned long inblock, oublock, cinblock, coublock;
@@ -1013,9 +1012,13 @@ static inline struct cpumask *sched_domain_span(struct sched_domain *sd)
         return to_cpumask(sd->span);
 }
 
-extern void partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
+extern void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
                                     struct sched_domain_attr *dattr_new);
 
+/* Allocate an array of sched domains, for partition_sched_domains(). */
+cpumask_var_t *alloc_sched_domains(unsigned int ndoms);
+void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms);
+
 /* Test a flag in parent sched domain */
 static inline int test_sd_parent(struct sched_domain *sd, int flag)
 {
@@ -1033,7 +1036,7 @@ unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu);
 struct sched_domain_attr;
 
 static inline void
-partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
+partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
                         struct sched_domain_attr *dattr_new)
 {
 }
@@ -1099,7 +1102,7 @@ struct sched_class {
 
         void (*set_curr_task) (struct rq *rq);
         void (*task_tick) (struct rq *rq, struct task_struct *p, int queued);
-        void (*task_new) (struct rq *rq, struct task_struct *p);
+        void (*task_fork) (struct task_struct *p);
 
         void (*switched_from) (struct rq *this_rq, struct task_struct *task,
                                int running);
@@ -1108,7 +1111,8 @@ struct sched_class {
         void (*prio_changed) (struct rq *this_rq, struct task_struct *task,
                              int oldprio, int running);
 
-        unsigned int (*get_rr_interval) (struct task_struct *task);
+        unsigned int (*get_rr_interval) (struct rq *rq,
+                                         struct task_struct *task);
 
 #ifdef CONFIG_FAIR_GROUP_SCHED
         void (*moved_group) (struct task_struct *p);
@@ -1148,8 +1152,6 @@ struct sched_entity {
         u64                     start_runtime;
         u64                     avg_wakeup;
 
-        u64                     avg_running;
-
 #ifdef CONFIG_SCHEDSTATS
         u64                     wait_start;
         u64                     wait_max;
@@ -1172,7 +1174,6 @@ struct sched_entity {
         u64                     nr_failed_migrations_running;
         u64                     nr_failed_migrations_hot;
         u64                     nr_forced_migrations;
-        u64                     nr_forced2_migrations;
 
         u64                     nr_wakeups;
         u64                     nr_wakeups_sync;
@@ -1331,7 +1332,9 @@ struct task_struct {
 
         cputime_t utime, stime, utimescaled, stimescaled;
         cputime_t gtime;
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
         cputime_t prev_utime, prev_stime;
+#endif
         unsigned long nvcsw, nivcsw; /* context switch counts */
         struct timespec start_time;             /* monotonic time */
         struct timespec real_start_time;        /* boot based time */
@@ -1406,7 +1409,7 @@ struct task_struct {
 #endif
 
         /* Protection of the PI data structures: */
-        spinlock_t pi_lock;
+        raw_spinlock_t pi_lock;
 
 #ifdef CONFIG_RT_MUTEXES
         /* PI waiters blocked on a rt_mutex held by this task */
@@ -1421,17 +1424,17 @@ struct task_struct {
 #endif
 #ifdef CONFIG_TRACE_IRQFLAGS
         unsigned int irq_events;
-        int hardirqs_enabled;
         unsigned long hardirq_enable_ip;
-        unsigned int hardirq_enable_event;
         unsigned long hardirq_disable_ip;
+        unsigned int hardirq_enable_event;
         unsigned int hardirq_disable_event;
-        int softirqs_enabled;
+        int hardirqs_enabled;
+        int hardirq_context;
         unsigned long softirq_disable_ip;
-        unsigned int softirq_disable_event;
         unsigned long softirq_enable_ip;
+        unsigned int softirq_disable_event;
         unsigned int softirq_enable_event;
-        int hardirq_context;
+        int softirqs_enabled;
         int softirq_context;
 #endif
 #ifdef CONFIG_LOCKDEP
@@ -1443,8 +1446,10 @@ struct task_struct {
         gfp_t lockdep_reclaim_gfp;
 #endif
 
+#ifdef CONFIG_FS_JOURNAL_INFO
 /* journalling filesystem info */
         void *journal_info;
+#endif
 
 /* stacked block device info */
         struct bio *bio_list, **bio_tail;
@@ -1539,6 +1544,14 @@ struct task_struct {
         unsigned long trace_recursion;
 #endif /* CONFIG_TRACING */
         unsigned long stack_start;
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */
+        struct memcg_batch_info {
+                int do_batch;   /* incremented when batch uncharge started */
+                struct mem_cgroup *memcg; /* target memcg of uncharge */
+                unsigned long bytes;            /* uncharged usage */
+                unsigned long memsw_bytes; /* uncharged mem+swap usage */
+        } memcg_batch;
+#endif
 };
 
 /* Future-safe accessor for struct task_struct's cpus_allowed. */
@@ -1720,9 +1733,8 @@ static inline void put_task_struct(struct task_struct *t)
                 __put_task_struct(t);
 }
 
-extern cputime_t task_utime(struct task_struct *p);
-extern cputime_t task_stime(struct task_struct *p);
-extern cputime_t task_gtime(struct task_struct *p);
+extern void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st);
+extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st);
 
 /*
  * Per process flags
@@ -1836,7 +1848,8 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
 extern int sched_clock_stable;
 #endif
 
-extern unsigned long long sched_clock(void);
+/* ftrace calls sched_clock() directly */
+extern unsigned long long notrace sched_clock(void);
 
 extern void sched_clock_init(void);
 extern u64 sched_clock_cpu(int cpu);
@@ -1899,14 +1912,22 @@ extern unsigned int sysctl_sched_wakeup_granularity;
 extern unsigned int sysctl_sched_shares_ratelimit;
 extern unsigned int sysctl_sched_shares_thresh;
 extern unsigned int sysctl_sched_child_runs_first;
+
+enum sched_tunable_scaling {
+        SCHED_TUNABLESCALING_NONE,
+        SCHED_TUNABLESCALING_LOG,
+        SCHED_TUNABLESCALING_LINEAR,
+        SCHED_TUNABLESCALING_END,
+};
+extern enum sched_tunable_scaling sysctl_sched_tunable_scaling;
+
 #ifdef CONFIG_SCHED_DEBUG
-extern unsigned int sysctl_sched_features;
 extern unsigned int sysctl_sched_migration_cost;
 extern unsigned int sysctl_sched_nr_migrate;
 extern unsigned int sysctl_sched_time_avg;
 extern unsigned int sysctl_timer_migration;
 
-int sched_nr_latency_handler(struct ctl_table *table, int write,
+int sched_proc_update_handler(struct ctl_table *table, int write,
                 void __user *buffer, size_t *length,
                 loff_t *ppos);
 #endif
@@ -2062,7 +2083,6 @@ extern int kill_proc_info(int, struct siginfo *, pid_t);
 extern int do_notify_parent(struct task_struct *, int);
 extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent);
 extern void force_sig(int, struct task_struct *);
-extern void force_sig_specific(int, struct task_struct *);
 extern int send_sig(int, struct task_struct *, int);
 extern void zap_other_threads(struct task_struct *p);
 extern struct sigqueue *sigqueue_alloc(void);
@@ -2081,16 +2101,18 @@ static inline int kill_cad_pid(int sig, int priv)
 #define SEND_SIG_PRIV   ((struct siginfo *) 1)
 #define SEND_SIG_FORCED ((struct siginfo *) 2)
 
-static inline int is_si_special(const struct siginfo *info)
-{
-        return info <= SEND_SIG_FORCED;
-}
-
-/* True if we are on the alternate signal stack.  */
-
+/*
+ * True if we are on the alternate signal stack.
+ */
 static inline int on_sig_stack(unsigned long sp)
 {
-        return (sp - current->sas_ss_sp < current->sas_ss_size);
+#ifdef CONFIG_STACK_GROWSUP
+        return sp >= current->sas_ss_sp &&
+                sp - current->sas_ss_sp < current->sas_ss_size;
+#else
+        return sp > current->sas_ss_sp &&
+                sp - current->sas_ss_sp <= current->sas_ss_size;
+#endif
 }
 
 static inline int sas_ss_flags(unsigned long sp)