diff --git a/[refs] b/[refs]
index 1ddb8df39884..1dfd794fd3aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04148b73b89d49fe0fe201bcee395e51f7d637ce
+refs/heads/master: 74870172824a78640ec4f03058d9bd35dfa08618
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index b5db51d2803d..dbda475b13bd 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -875,11 +875,11 @@ static int add_lock_to_list(struct lock_class *class, struct lock_class *this,
 	if (!entry)
 		return 0;
 
-	entry->class = this;
-	entry->distance = distance;
 	if (!save_trace(&entry->trace))
 		return 0;
 
+	entry->class = this;
+	entry->distance = distance;
 	/*
 	 * Since we never remove from the dependency list, the list can
 	 * be walked lockless by other CPUs, it's only allocation