summaryrefslogtreecommitdiff
path: root/fs/proc/array.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:38:57 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 18:38:57 -0800
commita5287abe398b74df9040d6dcd8356cf53a174e84 (patch)
tree181a6ce3feb61fabc1dd3ca2d452074a419df431 /fs/proc/array.c
parent4fdbe71c852f4b44203913c93a5d3a8a12041167 (diff)
v2.4.5.2 -> v2.4.5.3
- remember to increment the version number - Chris Mason: reiserfs mark_journal_new and bh leak fix - Richard Gooch: devfs update - Alexander Viro: further FS cleanup (superblock list) - David Woodhouse: MTD update - Kai Germaschewski: ISDN update (stanford checker fixes etc) - Rich Baum: gcc-3.0 warning fixes - Jeff Garzik: network driver updates - Geert Uytterhoeven: m68k fbdev logo merge glitch fix - Andrea Arcangeli: fix signal return path - David Miller: Sparc updates - Johannes Erdfelt: USB update - Carsten Otte, Andries Brouwer: don't clear blk_size unconditionally on partition check - Martin Frey: alpha Sable irq fix - Paul Mackerras: PPC softirq update - Patrick Mochel: PCI power management infrastructure - Robert Siemer: miroSOUND driver update - Neil Brown: knfsd updates, including ability to export ReiserFS filesystems - Trond Myklebust: NFS readdir fixup, don't update atime on client - Andrew Morton: truncate_inode_pages speedup - Paul Menage: make inode quota count all inodes..
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r--fs/proc/array.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 6b08c3910d5f..a1eb02f157a5 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -421,13 +421,12 @@ static inline void statm_pte_range(pmd_t * pmd, unsigned long address, unsigned
++*total;
if (!pte_present(page))
continue;
+ ptpage = pte_page(page);
+ if ((!VALID_PAGE(ptpage)) || PageReserved(ptpage))
+ continue;
++*pages;
if (pte_dirty(page))
++*dirty;
- ptpage = pte_page(page);
- if ((!VALID_PAGE(ptpage)) ||
- PageReserved(ptpage))
- continue;
if (page_count(pte_page(page)) > 1)
++*shared;
} while (address < end);