Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent

2 files changed, 16 insertions, 5 deletions

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 2e93f99b1480..7a2a79d2cf2c 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -202,9 +202,20 @@ static struct thread_stat *thread_stat_findnew_first(u32 tid)
 SINGLE_KEY(nr_acquired)
 SINGLE_KEY(nr_contended)
 SINGLE_KEY(wait_time_total)
-SINGLE_KEY(wait_time_min)
 SINGLE_KEY(wait_time_max)
 
+static int lock_stat_key_wait_time_min(struct lock_stat *one,
+                                        struct lock_stat *two)
+{
+        u64 s1 = one->wait_time_min;
+        u64 s2 = two->wait_time_min;
+        if (s1 == ULLONG_MAX)
+                s1 = 0;
+        if (s2 == ULLONG_MAX)
+                s2 = 0;
+        return s1 > s2;
+}
+
 struct lock_key {
         /*
          * name: the value for specify by user
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index 97d76562a1a0..26d4d3fd6deb 100755
--- a/tools/perf/util/PERF-VERSION-GEN
+++ b/tools/perf/util/PERF-VERSION-GEN
@@ -23,10 +23,10 @@ if test -d ../../.git -o -f ../../.git &&
 then
         VN=$(echo "$VN" | sed -e 's/-/./g');
 else
-        eval `grep '^VERSION\s*=' ../../Makefile|tr -d ' '`
-        eval `grep '^PATCHLEVEL\s*=' ../../Makefile|tr -d ' '`
-        eval `grep '^SUBLEVEL\s*=' ../../Makefile|tr -d ' '`
-        eval `grep '^EXTRAVERSION\s*=' ../../Makefile|tr -d ' '`
+        eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
+        eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
+        eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
+        eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
 
         VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
 fi