diff --git a/[refs] b/[refs]
index 8b4d54e6e7fd..80b7414b5ddd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 722d0172377a5697919b9f7e5beb95165b1dec4e
+refs/heads/master: ea5b41f9d595be354f7a50e56b28c2d72e6e88a5
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index 7a3ae56b3a7f..4f8df01dbe51 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -386,7 +386,8 @@ static int save_trace(struct stack_trace *trace)
 	 * complete trace that maxes out the entries provided will be reported
 	 * as incomplete, friggin useless </rant>
 	 */
-	if (trace->entries[trace->nr_entries-1] == ULONG_MAX)
+	if (trace->nr_entries != 0 &&
+	    trace->entries[trace->nr_entries-1] == ULONG_MAX)
 		trace->nr_entries--;
 
 	trace->max_entries = trace->nr_entries;