diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-02 18:38:18 -0400 |
---|---|---|
committer | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-23 05:48:01 -0400 |
commit | 9617760287eec9091d26e6967bd3e4194de18f97 (patch) | |
tree | 8a13097b1c3e86f989f9c067bc76a451362a1c13 /fs/proc/proc_misc.c | |
parent | 5b3acc8de8b2bc459afae6e09ada45c7e5b11bbf (diff) |
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.c | 21 |
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, | |||
78 | return len; | 78 | return len; |
79 | } | 79 | } |
80 | 80 | ||
81 | static int uptime_read_proc(char *page, char **start, off_t off, | ||
82 | int count, int *eof, void *data) | ||
83 | { | ||
84 | struct timespec uptime; | ||
85 | struct timespec idle; | ||
86 | int len; | ||
87 | cputime_t idletime = cputime_add(init_task.utime, init_task.stime); | ||
88 | |||
89 | do_posix_clock_monotonic_gettime(&uptime); | ||
90 | monotonic_to_bootbased(&uptime); | ||
91 | cputime_to_timespec(idletime, &idle); | ||
92 | len = sprintf(page,"%lu.%02lu %lu.%02lu\n", | ||
93 | (unsigned long) uptime.tv_sec, | ||
94 | (uptime.tv_nsec / (NSEC_PER_SEC / 100)), | ||
95 | (unsigned long) idle.tv_sec, | ||
96 | (idle.tv_nsec / (NSEC_PER_SEC / 100))); | ||
97 | |||
98 | return proc_calc_metrics(page, start, off, count, eof, len); | ||
99 | } | ||
100 | |||
101 | int __attribute__((weak)) arch_report_meminfo(char *page) | 81 | int __attribute__((weak)) arch_report_meminfo(char *page) |
102 | { | 82 | { |
103 | return 0; | 83 | return 0; |
@@ -836,7 +816,6 @@ void __init proc_misc_init(void) | |||
836 | char *name; | 816 | char *name; |
837 | int (*read_proc)(char*,char**,off_t,int,int*,void*); | 817 | int (*read_proc)(char*,char**,off_t,int,int*,void*); |
838 | } *p, simple_ones[] = { | 818 | } *p, simple_ones[] = { |
839 | {"uptime", uptime_read_proc}, | ||
840 | {"meminfo", meminfo_read_proc}, | 819 | {"meminfo", meminfo_read_proc}, |
841 | {"version", version_read_proc}, | 820 | {"version", version_read_proc}, |
842 | #ifdef CONFIG_PROC_HARDWARE | 821 | #ifdef CONFIG_PROC_HARDWARE |