From 0f72edc41e63f6061ad53f24299bb9f2240beec5 Mon Sep 17 00:00:00 2001
From: Davidlohr Bueso <dave@gnu.org>
Date: Tue, 23 Oct 2012 01:21:09 +0200
Subject: [PATCH] --- yaml --- r: 336747 b: refs/heads/master c:
 8316bd72c0248adbb9572abf2dd045a95f682bcd h: refs/heads/master i:   336745:
 9d70a857114af10058207ac4988126eb6d1e688f   336743:
 316b11fdc95f151503859e66ccbae829f150ae28 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/swap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 96f14c23d516..4985e3a50941 100644
--- 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
index 3c9d764eb0d8..7c33ed200410 100644
--- 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 */