3 files changed, 27 insertions, 16 deletions

diff --git a/procps/Config.src b/procps/Config.src
index 2b1b8ab11..7fcce98c5 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -5,7 +5,12 @@
 
 menu "Process Utilities"
 
-INSERT
+config FEATURE_FAST_TOP
+        bool "Faster /proc scanning code (+100 bytes)"
+        default n  # all "fast or small" options default to small
+        help
+        This option makes top and ps ~20% faster (or 20% less CPU hungry),
+        but code size is slightly bigger.
 
 config FEATURE_SHOW_THREADS
         bool "Support thread display in ps/pstree/top"
@@ -15,4 +20,6 @@ config FEATURE_SHOW_THREADS
         Enables the ps -T option, showing of threads in pstree,
         and 'h' command in top.
 
+INSERT
+
 endmenu
diff --git a/procps/powertop.c b/procps/powertop.c
index fc6018b7a..24c2b320f 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -505,7 +505,7 @@ static void cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx,
                                 unsigned int *edx)
 {
         /* EAX value specifies what information to return */
-        __asm__(
+        asm (
                 "       pushl %%ebx\n"     /* Save EBX */
                 "       cpuid\n"
                 "       movl %%ebx, %1\n"  /* Save content of EBX */
diff --git a/procps/ps.c b/procps/ps.c
index 801a6fdf3..4c6e07e8b 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -451,17 +451,19 @@ static void parse_o(char* opt)
                         opt = comma + 1;
                         continue;
                 }
-                break;
-        }
-        // opt points to last spec in comma separated list.
-        // This one can have =HEADER part.
-        new = new_out_t();
-        if (equal)
-                *equal = '\0';
-        *new = *find_out_spec(opt);
-        if (equal) {
-                *equal = '=';
-                new->header = equal + 1;
+                // opt points to last spec in comma separated list.
+                // This one can have =HEADER part.
+                new = new_out_t();
+                if (equal)
+                        *equal = '\0';
+                *new = *find_out_spec(opt);
+                if (!equal)
+                        break;
+                *equal++ = '=';
+                new->header = equal;
+                comma = strchr(equal, ',');
+                if (comma)
+                        *comma = '\0';
                 // POSIX: the field widths shall be ... at least as wide as
                 // the header text (default or overridden value).
                 // If the header text is null, such as -o user=,
@@ -469,10 +471,12 @@ static void parse_o(char* opt)
                 // default header text
                 if (new->header[0]) {
                         new->width = strlen(new->header);
-                        print_header = 1;
                 }
-        } else
-                print_header = 1;
+                if (!comma)
+                        break;
+                //*comma = ','; /* no, new->header should stay NUL-terminated */
+                opt = comma + 1;
+        }
 }
 
 static void alloc_line_buffer(void)