Merge remote-tracking branch 'y2038/y2038'

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

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index d7ccb87a6714b17cb5b4a86232428cb7b5253799..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/stat.h>
 #include <linux/string.h>
 #include <linux/time.h>

+#include <linux/time64.h>

 #include <linux/backing-dev.h>
 #include <linux/sort.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 */
 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 */
 };
 
        spinlock_t lock;        /* guards read or write of above */
 };
 


@@ -1374,7 +1375,7 @@ out:
  */
 
 #define FM_COEF 933            /* coefficient for half-life of 10 secs */
  */
 
 #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 */
 
 #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)
 {
 /* 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;
 
        if (ticks == 0)
                return;