2.6.10 bumped the slabinfo minor; let the old parser handle it

This commit is contained in:
albert 2005-01-10 05:59:41 +00:00
parent 33721d7e57
commit 8747618ef2
2 changed files with 4 additions and 2 deletions

3
NEWS
View File

@ -8,7 +8,8 @@ ps: security labels can contain any printable ASCII
top: help and version message on stdout, with exit(0) #283541 top: help and version message on stdout, with exit(0) #283541
ps: SIGTSTP and SIGTTOU shouldn't print bug email address #246123 ps: SIGTSTP and SIGTTOU shouldn't print bug email address #246123
slabtop: compile with glibc 2.2.17 (and older, likely) slabtop: compile with glibc 2.2.17 (and older, likely)
slabtop: fix overflow on huge NUMA boxes #264640 slabtop: fix overflow on huge NUMA boxes #264640
slabtop: accept any slabinfo 2.x format g77301
procps-3.2.3 --> procps-3.2.4 procps-3.2.3 --> procps-3.2.4

View File

@ -7,6 +7,7 @@
* This program is licensed under the GNU Library General Public License, v2 * This program is licensed under the GNU Library General Public License, v2
* *
* Copyright (C) 2003 Chris Rivera * Copyright (C) 2003 Chris Rivera
* Copyright 2004, Albert Cahalan
*/ */
#include <stdlib.h> #include <stdlib.h>
@ -293,7 +294,7 @@ int get_slabinfo(struct slab_info **list, struct slab_stat *stats)
return 1; return 1;
} }
if (major == 2 && minor == 0) if (major == 2)
ret = parse_slabinfo20(list, stats, slabfile); ret = parse_slabinfo20(list, stats, slabfile);
else if (major == 1 && minor == 1) else if (major == 1 && minor == 1)
ret = parse_slabinfo11(list, stats, slabfile); ret = parse_slabinfo11(list, stats, slabfile);