5 files changed, 12 insertions, 7 deletions

diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 349bc96ca1fe..e5f18a288b74 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -17,6 +17,7 @@ libperf-y += levenshtein.o
 libperf-y += llvm-utils.o
 libperf-y += parse-options.o
 libperf-y += parse-events.o
+libperf-y += perf_regs.o
 libperf-y += path.o
 libperf-y += rbtree.o
 libperf-y += bitmap.o
@@ -103,7 +104,6 @@ libperf-$(CONFIG_LIBBABELTRACE) += data-convert-bt.o
 
 libperf-y += scripting-engines/
 
-libperf-$(CONFIG_PERF_REGS) += perf_regs.o
 libperf-$(CONFIG_ZLIB) += zlib.o
 libperf-$(CONFIG_LZMA) += lzma.o
 
diff --git a/tools/perf/util/perf_regs.c b/tools/perf/util/perf_regs.c
index 885e8ac83997..6b8eb13e14e4 100644
--- a/tools/perf/util/perf_regs.c
+++ b/tools/perf/util/perf_regs.c
@@ -6,6 +6,7 @@ const struct sample_reg __weak sample_reg_masks[] = {
         SMPL_REG_END
 };
 
+#ifdef HAVE_PERF_REGS_SUPPORT
 int perf_reg_value(u64 *valp, struct regs_dump *regs, int id)
 {
         int i, idx = 0;
@@ -29,3 +30,4 @@ out:
         *valp = regs->cache_regs[id];
         return 0;
 }
+#endif
diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h
index 2984dcc54d67..679d6e493962 100644
--- a/tools/perf/util/perf_regs.h
+++ b/tools/perf/util/perf_regs.h
@@ -2,6 +2,7 @@
 #define __PERF_REGS_H
 
 #include <linux/types.h>
+#include <linux/compiler.h>
 
 struct regs_dump;
 
diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c
index 879f9870a6bc..0692d99b6d8f 100644
--- a/tools/usb/testusb.c
+++ b/tools/usb/testusb.c
@@ -394,7 +394,7 @@ int main (int argc, char **argv)
          *      low speed, interrupt    8 *  1     =     8
          */
         param.iterations = 1000;
-        param.length = 512;
+        param.length = 1024;
         param.vary = 512;
         param.sglen = 32;
 
@@ -454,10 +454,10 @@ usage:
                         "\t-t testnum   only run specified case\n"
                         "\t-n           no test running, show devices to be tested\n"
                         "Case arguments:\n"
-                        "\t-c iterations        default 1000\n"
-                        "\t-s packetsize        default 512\n"
-                        "\t-g sglen     default 32\n"
-                        "\t-v vary              default 512\n",
+                        "\t-c iterations                default 1000\n"
+                        "\t-s transfer length   default 1024\n"
+                        "\t-g sglen             default 32\n"
+                        "\t-v vary                      default 512\n",
                         argv[0]);
                 return 1;
         }
diff --git a/tools/usb/usbip/src/usbip_detach.c b/tools/usb/usbip/src/usbip_detach.c
index 05c6d15856eb..9db9d21bb2ec 100644
--- a/tools/usb/usbip/src/usbip_detach.c
+++ b/tools/usb/usbip/src/usbip_detach.c
@@ -47,7 +47,9 @@ static int detach_port(char *port)
         uint8_t portnum;
         char path[PATH_MAX+1];
 
-        for (unsigned int i = 0; i < strlen(port); i++)
+        unsigned int port_len = strlen(port);
+
+        for (unsigned int i = 0; i < port_len; i++)
                 if (!isdigit(port[i])) {
                         err("invalid port %s", port);
                         return -1;