---

yaml --- r: 336747 b: refs/heads/master c: 8316bd7 h: refs/heads/master i: 336745: 9d70a85 336743: 316b11f v: v3
git-mirror · Nov 14, 2012 · 0f72edc · 0f72edc
1 parent af08264
commit 0f72edc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 883ee4f79d636d13f24c2479c66d42cb652b0239
+refs/heads/master: 8316bd72c0248adbb9572abf2dd045a95f682bcd
diff --git a/trunk/kernel/power/swap.c b/trunk/kernel/power/swap.c
@@ -126,7 +126,7 @@ static int swsusp_extents_insert(unsigned long swap_offset)
 
 	/* Figure out where to put the new node */
 	while (*new) {
-		ext = container_of(*new, struct swsusp_extent, node);
+		ext = rb_entry(*new, struct swsusp_extent, node);
 		parent = *new;
 		if (swap_offset < ext->start) {
 			/* Try to merge */