diff --git a/[refs] b/[refs] index d006c8fc03d2..23a73012671c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc39778f952a820b7da45756a900a4778da343cd +refs/heads/master: 7c44319dc6deb0028ef7811670bf1e4bc6644672 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 01ed610f9b87..a28840b11b89 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -2423,10 +2423,13 @@ static int do_io_accounting(struct task_struct *task, char *buffer, int whole) "read_bytes: %llu\n" "write_bytes: %llu\n" "cancelled_write_bytes: %llu\n", - acct.rchar, acct.wchar, - acct.syscr, acct.syscw, - acct.read_bytes, acct.write_bytes, - acct.cancelled_write_bytes); + (unsigned long long)acct.rchar, + (unsigned long long)acct.wchar, + (unsigned long long)acct.syscr, + (unsigned long long)acct.syscw, + (unsigned long long)acct.read_bytes, + (unsigned long long)acct.write_bytes, + (unsigned long long)acct.cancelled_write_bytes); } static int proc_tid_io_accounting(struct task_struct *task, char *buffer)