Merge remote-tracking branch 'y2038/y2038'

[karo-tx-linux.git] / kernel / cpuset.c

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 0b361a0b58f69fe8d6aaa2ede0d2b402cf8809a5..c02d677c541c68067f76f0053864ed176ba39ccc 100644 (file)
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -51,6 +51,7 @@
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>
+#include <linux/time64.h>
 #include <linux/backing-dev.h>
 #include <linux/sort.h>
 
@@ -68,7 +69,7 @@ struct static_key cpusets_enabled_key __read_mostly = STATIC_KEY_INIT_FALSE;
 struct fmeter {
        int cnt;                /* unprocessed events count */
        int val;                /* most recent output value */
-       time_t time;            /* clock (secs) when val computed */
+       time64_t time;          /* clock (secs) when val computed */
        spinlock_t lock;        /* guards read or write of above */
 };
 
@@ -498,7 +499,7 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial)
         * be changed to have empty cpus_allowed or mems_allowed.
         */
        ret = -ENOSPC;
-       if ((cgroup_has_tasks(cur->css.cgroup) || cur->attach_in_progress)) {
+       if ((cgroup_is_populated(cur->css.cgroup) || cur->attach_in_progress)) {
                if (!cpumask_empty(cur->cpus_allowed) &&
                    cpumask_empty(trial->cpus_allowed))
                        goto out;
@@ -1374,7 +1375,7 @@ out:
  */
 
 #define FM_COEF 933            /* coefficient for half-life of 10 secs */
-#define FM_MAXTICKS ((time_t)99) /* useless computing more ticks than this */
+#define FM_MAXTICKS ((u32)99)   /* useless computing more ticks than this */
 #define FM_MAXCNT 1000000      /* limit cnt to avoid overflow */
 #define FM_SCALE 1000          /* faux fixed point scale */
 
@@ -1390,8 +1391,11 @@ static void fmeter_init(struct fmeter *fmp)
 /* Internal meter update - process cnt events and update value */
 static void fmeter_update(struct fmeter *fmp)
 {
-       time_t now = get_seconds();
-       time_t ticks = now - fmp->time;
+       time64_t now;
+       u32 ticks;
+
+       now = ktime_get_seconds();
+       ticks = now - fmp->time;
 
        if (ticks == 0)
                return;
@@ -1488,7 +1492,7 @@ static void cpuset_attach(struct cgroup_subsys_state *css,
        /* static buf protected by cpuset_mutex */
        static nodemask_t cpuset_attach_nodemask_to;
        struct task_struct *task;
-       struct task_struct *leader = cgroup_taskset_first(tset);
+       struct task_struct *leader;
        struct cpuset *cs = css_cs(css);
        struct cpuset *oldcs = cpuset_attach_old_cs;
 
@@ -1514,12 +1518,11 @@ static void cpuset_attach(struct cgroup_subsys_state *css,
        }
 
        /*
-        * Change mm, possibly for multiple threads in a threadgroup. This
-        * is expensive and may sleep and should be moved outside migration
-        * path proper.
+        * Change mm for all threadgroup leaders. This is expensive and may
+        * sleep and should be moved outside migration path proper.
         */
        cpuset_attach_nodemask_to = cs->effective_mems;
-       if (thread_group_leader(leader)) {
+       cgroup_taskset_for_each_leader(leader, tset) {
                struct mm_struct *mm = get_task_mm(leader);
 
                if (mm) {