diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /mm/vmstat.c | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
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) |