diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-03 02:21:47 +0400 |
|---|---|---|
| committer | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-23 13:45:28 +0400 |
| commit | 5b3acc8de8b2bc459afae6e09ada45c7e5b11bbf (patch) | |
| tree | 295a8d4401fb63e7c0f32090f1fafce1835765d6 /fs/proc/proc_misc.c | |
| parent | 6c2f91e077f1b60e7f83b7ee044f965f469cfdb3 (diff) | |
proc: switch /proc/loadavg to seq_file
and move it to fs/proc/loadavg.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 | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 7ea52c79b2d..ff42206c8ae 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -57,8 +57,6 @@ #include <asm/div64.h> #include "internal.h" -#define LOAD_INT(x) ((x) >> FSHIFT) -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) /* * Warning: stuff below (imported functions) assumes that its output will fit * into one page. For some of those functions it may be wrong. Moreover, we @@ -80,29 +78,6 @@ static int proc_calc_metrics(char *page, char **start, off_t off, return len; } -static int loadavg_read_proc(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int a, b, c; - int len; - unsigned long seq; - - do { - seq = read_seqbegin(&xtime_lock); - a = avenrun[0] + (FIXED_1/200); - b = avenrun[1] + (FIXED_1/200); - c = avenrun[2] + (FIXED_1/200); - } while (read_seqretry(&xtime_lock, seq)); - - len = sprintf(page,"%d.%02d %d.%02d %d.%02d %ld/%d %d\n", - LOAD_INT(a), LOAD_FRAC(a), - LOAD_INT(b), LOAD_FRAC(b), - LOAD_INT(c), LOAD_FRAC(c), - nr_running(), nr_threads, - task_active_pid_ns(current)->last_pid); - return proc_calc_metrics(page, start, off, count, eof, len); -} - static int uptime_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -861,7 +836,6 @@ void __init proc_misc_init(void) char *name; int (*read_proc)(char*,char**,off_t,int,int*,void*); } *p, simple_ones[] = { - {"loadavg", loadavg_read_proc}, {"uptime", uptime_read_proc}, {"meminfo", meminfo_read_proc}, {"version", version_read_proc}, |