Merge branch 'for-tip' of...

Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent

arch/powerpc/oprofile/op_model_cell.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1077,7 +1077,7 @@ static int calculate_lfsr(int n)
		index = ENTRIES-1;

		/* make sure index is valid */
		if ((index > ENTRIES) \|\| (index < 0))
		if ((index >= ENTRIES) \|\| (index < 0))
		index = ENTRIES-1;

		return initial_lfsr[index];