diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-29 21:46:48 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-29 21:46:48 +0100 |
commit | 170bb4c800d2b65df52f37400fb20276273650d8 (patch) | |
tree | 86ff97efaeeac6e8533feb4899ec674ddbc0a065 /kernel/power/swap.c | |
parent | 64adb0192ff309051492b34139bb842024ebb119 (diff) | |
parent | e5f5762177be52fde50ccba88938d66b5103c8e0 (diff) | |
download | linux-170bb4c800d2b65df52f37400fb20276273650d8.tar.bz2 |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Freezer: Fixup compile error of try_to_freeze_nowarn()
driver core / PM: move the calling to device_pm_remove behind the calling to bus_remove_device
PM / Hibernate: use rb_entry
PM / sysfs: replace strict_str* with kstrto*
Diffstat (limited to 'kernel/power/swap.c')
-rw-r--r-- | kernel/power/swap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 3c9d764eb0d8..7c33ed200410 100644 --- a/kernel/power/swap.c +++ b/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 */ |