diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /fs/proc/proc_misc.c | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'fs/proc/proc_misc.c')
| -rw-r--r-- | fs/proc/proc_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 9f2cfc30f9..9421562254 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -169,7 +169,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 169 | "Mapped: %8lu kB\n" | 169 | "Mapped: %8lu kB\n" |
| 170 | "Slab: %8lu kB\n" | 170 | "Slab: %8lu kB\n" |
| 171 | "PageTables: %8lu kB\n" | 171 | "PageTables: %8lu kB\n" |
| 172 | "NFS Unstable: %8lu kB\n" | 172 | "NFS_Unstable: %8lu kB\n" |
| 173 | "Bounce: %8lu kB\n" | 173 | "Bounce: %8lu kB\n" |
| 174 | "CommitLimit: %8lu kB\n" | 174 | "CommitLimit: %8lu kB\n" |
| 175 | "Committed_AS: %8lu kB\n" | 175 | "Committed_AS: %8lu kB\n" |