Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / fs / proc / stat.c

diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index 510413e..7907e45 100644 (file)
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -80,19 +80,17 @@ static u64 get_iowait_time(int cpu)
 static int show_stat(struct seq_file *p, void *v)
 {
        int i, j;
-       unsigned long jif;
        u64 user, nice, system, idle, iowait, irq, softirq, steal;
        u64 guest, guest_nice;
        u64 sum = 0;
        u64 sum_softirq = 0;
        unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
-       struct timespec boottime;
+       struct timespec64 boottime;
 
        user = nice = system = idle = iowait =
                irq = softirq = steal = 0;
        guest = guest_nice = 0;
-       getboottime(&boottime);
-       jif = boottime.tv_sec;
+       getboottime64(&boottime);
 
        for_each_possible_cpu(i) {
                user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
@@ -163,12 +161,12 @@ static int show_stat(struct seq_file *p, void *v)
 
        seq_printf(p,
                "\nctxt %llu\n"
-               "btime %lu\n"
+               "btime %llu\n"
                "processes %lu\n"
                "procs_running %lu\n"
                "procs_blocked %lu\n",
                nr_context_switches(),
-               (unsigned long)jif,
+               (unsigned long long)boottime.tv_sec,
                total_forks,
                nr_running(),
                nr_iowait());