Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb4316dd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' of... 

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
parents 13e5befa 9df03abe

tools/perf/builtin-lock.c

+12 −1
Original line number Diff line number Diff line
@@ -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

tools/perf/util/PERF-VERSION-GEN

+4 −4
Original line number Diff line number Diff line
@@ -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