From: Andrew Morton <akpm@osdl.org>

That's what min_t is for.

Cc: Martin Peschke <mp3@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 lib/statistic.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN lib/statistic.c~statistics-infrastructure-fix-buffer-overflow-in-histogram-with-linear-tidy lib/statistic.c
--- a/lib/statistic.c~statistics-infrastructure-fix-buffer-overflow-in-histogram-with-linear-tidy
+++ a/lib/statistic.c
@@ -1033,7 +1033,7 @@ static int statistic_histogram_calc_inde
 		return 0;
 	i = value - stat->u.histogram.range_min;
 	do_div(i, stat->u.histogram.base_interval);
-	return min(i, (unsigned long long)(stat->u.histogram.last_index));
+	return min_t(unsigned long long, i, stat->u.histogram.last_index);
 }
 
 static int statistic_histogram_calc_index_log2(struct statistic *stat,
_