diff options
Diffstat (limited to 'fs/proc/proc_misc.c')
| -rw-r--r-- | fs/proc/proc_misc.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 51288db37a0c..2686592dbcb2 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
| 30 | #include <linux/mmzone.h> | 30 | #include <linux/mmzone.h> |
| 31 | #include <linux/pagemap.h> | 31 | #include <linux/pagemap.h> |
| 32 | #include <linux/interrupt.h> | ||
| 32 | #include <linux/swap.h> | 33 | #include <linux/swap.h> |
| 33 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 34 | #include <linux/smp.h> | 35 | #include <linux/smp.h> |
| @@ -64,7 +65,6 @@ | |||
| 64 | */ | 65 | */ |
| 65 | extern int get_hardware_list(char *); | 66 | extern int get_hardware_list(char *); |
| 66 | extern int get_stram_list(char *); | 67 | extern int get_stram_list(char *); |
| 67 | extern int get_filesystem_list(char *); | ||
| 68 | extern int get_exec_domain_list(char *); | 68 | extern int get_exec_domain_list(char *); |
| 69 | extern int get_dma_list(char *); | 69 | extern int get_dma_list(char *); |
| 70 | 70 | ||
| @@ -84,10 +84,15 @@ static int loadavg_read_proc(char *page, char **start, off_t off, | |||
| 84 | { | 84 | { |
| 85 | int a, b, c; | 85 | int a, b, c; |
| 86 | int len; | 86 | int len; |
| 87 | unsigned long seq; | ||
| 88 | |||
| 89 | do { | ||
| 90 | seq = read_seqbegin(&xtime_lock); | ||
| 91 | a = avenrun[0] + (FIXED_1/200); | ||
| 92 | b = avenrun[1] + (FIXED_1/200); | ||
| 93 | c = avenrun[2] + (FIXED_1/200); | ||
| 94 | } while (read_seqretry(&xtime_lock, seq)); | ||
| 87 | 95 | ||
| 88 | a = avenrun[0] + (FIXED_1/200); | ||
| 89 | b = avenrun[1] + (FIXED_1/200); | ||
| 90 | c = avenrun[2] + (FIXED_1/200); | ||
| 91 | len = sprintf(page,"%d.%02d %d.%02d %d.%02d %ld/%d %d\n", | 96 | len = sprintf(page,"%d.%02d %d.%02d %d.%02d %ld/%d %d\n", |
| 92 | LOAD_INT(a), LOAD_FRAC(a), | 97 | LOAD_INT(a), LOAD_FRAC(a), |
| 93 | LOAD_INT(b), LOAD_FRAC(b), | 98 | LOAD_INT(b), LOAD_FRAC(b), |
| @@ -599,7 +604,6 @@ static void int_seq_stop(struct seq_file *f, void *v) | |||
| 599 | } | 604 | } |
| 600 | 605 | ||
| 601 | 606 | ||
| 602 | extern int show_interrupts(struct seq_file *f, void *v); /* In arch code */ | ||
| 603 | static struct seq_operations int_seq_ops = { | 607 | static struct seq_operations int_seq_ops = { |
| 604 | .start = int_seq_start, | 608 | .start = int_seq_start, |
| 605 | .next = int_seq_next, | 609 | .next = int_seq_next, |
