summaryrefslogtreecommitdiff
path: root/fs/proc/proc_misc.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-10-03 02:38:18 +0400
committerAlexey Dobriyan <adobriyan@gmail.com>2008-10-23 13:48:01 +0400
commit9617760287eec9091d26e6967bd3e4194de18f97 (patch)
tree8a13097b1c3e86f989f9c067bc76a451362a1c13 /fs/proc/proc_misc.c
parent5b3acc8de8b2bc459afae6e09ada45c7e5b11bbf (diff)
downloadlinux-9617760287eec9091d26e6967bd3e4194de18f97.tar.xz
proc: switch /proc/uptime to seq_file
and move it to fs/proc/uptime.c while I'm at it. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Diffstat (limited to 'fs/proc/proc_misc.c')
-rw-r--r--fs/proc/proc_misc.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index ff42206c8aed..484b6011bf0b 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -78,26 +78,6 @@ static int proc_calc_metrics(char *page, char **start, off_t off,
return len;
}
-static int uptime_read_proc(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- struct timespec uptime;
- struct timespec idle;
- int len;
- cputime_t idletime = cputime_add(init_task.utime, init_task.stime);
-
- do_posix_clock_monotonic_gettime(&uptime);
- monotonic_to_bootbased(&uptime);
- cputime_to_timespec(idletime, &idle);
- len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
- (unsigned long) uptime.tv_sec,
- (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
- (unsigned long) idle.tv_sec,
- (idle.tv_nsec / (NSEC_PER_SEC / 100)));
-
- return proc_calc_metrics(page, start, off, count, eof, len);
-}
-
int __attribute__((weak)) arch_report_meminfo(char *page)
{
return 0;
@@ -836,7 +816,6 @@ void __init proc_misc_init(void)
char *name;
int (*read_proc)(char*,char**,off_t,int,int*,void*);
} *p, simple_ones[] = {
- {"uptime", uptime_read_proc},
{"meminfo", meminfo_read_proc},
{"version", version_read_proc},
#ifdef CONFIG_PROC_HARDWARE