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

Commit 68722101 authored by George Beshers's avatar George Beshers Committed by Ingo Molnar
Browse files

locking/lockdep: Remove hard coded array size dependency 



An apparent oversight left a hardcoded '4' in place when
LOCKSTAT_POINTS was introduced.

The contention_point[] and contending_point[] arrays in the
structs lock_class and lock_class_stats need to be the same
size for the loops in lock_stats() to be correct.

This patch allows LOCKSTAT_POINTS to be changed without
affecting the correctness of the code.

Signed-off-by: default avatarGeorge Beshers <gbeshers@sgi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 405963b6

include/linux/lockdep.h

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ enum bounce_type { 
};



struct lock_class_stats {

	unsigned long			contention_point[4];

	unsigned long			contending_point[4];

	unsigned long			contention_point[LOCKSTAT_POINTS];

	unsigned long			contending_point[LOCKSTAT_POINTS];

	struct lock_time		read_waittime;

	struct lock_time		write_waittime;

	struct lock_time		read_holdtime;