diff --git a/[refs] b/[refs]
index ca2e4d9177ba..9372c5f05fd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 648616343cdbe904c585a6c12e323d3b3c72e46f
+refs/heads/master: c3e0ef9a298e028a82ada28101ccd5cf64d209ee
diff --git a/trunk/fs/proc/uptime.c b/trunk/fs/proc/uptime.c
index ac5243657da3..ab515109fec9 100644
--- a/trunk/fs/proc/uptime.c
+++ b/trunk/fs/proc/uptime.c
@@ -11,15 +11,20 @@ static int uptime_proc_show(struct seq_file *m, void *v)
 {
 	struct timespec uptime;
 	struct timespec idle;
+	cputime64_t idletime;
+	u64 nsec;
+	u32 rem;
 	int i;
-	cputime_t idletime = 0;
 
+	idletime = 0;
 	for_each_possible_cpu(i)
 		idletime += kstat_cpu(i).cpustat.idle;
 
 	do_posix_clock_monotonic_gettime(&uptime);
 	monotonic_to_bootbased(&uptime);
-	cputime_to_timespec(idletime, &idle);
+	nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
+	idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
+	idle.tv_nsec = rem;
 	seq_printf(m, "%lu.%02lu %lu.%02lu\n",
 			(unsigned long) uptime.tv_sec,
 			(uptime.tv_nsec / (NSEC_PER_SEC / 100)),