diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
| commit | ca19e77e44985b5500f5461f7d2f4ce799cb60ce (patch) | |
| tree | 3ba3635ac2f212b332198b14cc3239195c153e67 /mm/vmstat.c | |
| parent | 9d57883f08d3c0c111b50bf185dfee9731a12c76 (diff) | |
| parent | ac70eb1305d5a81efd1e32327d7e79be15a63a5a (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'mm/vmstat.c')
| -rw-r--r-- | mm/vmstat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index cd2e42be7b68..42eac4d33216 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
| @@ -949,7 +949,7 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos) | |||
| 949 | v[PGPGIN] /= 2; /* sectors -> kbytes */ | 949 | v[PGPGIN] /= 2; /* sectors -> kbytes */ |
| 950 | v[PGPGOUT] /= 2; | 950 | v[PGPGOUT] /= 2; |
| 951 | #endif | 951 | #endif |
| 952 | return m->private + *pos; | 952 | return (unsigned long *)m->private + *pos; |
| 953 | } | 953 | } |
| 954 | 954 | ||
| 955 | static void *vmstat_next(struct seq_file *m, void *arg, loff_t *pos) | 955 | static void *vmstat_next(struct seq_file *m, void *arg, loff_t *pos) |