summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-18 03:27:08 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-18 03:27:08 +0200
commit6c16f42a4e01ef1543fb21e594c2b25d00697649 (patch)
treea99d0e3f5831a4f2cef3e4266a034561185a1213 /arch/x86
parent694d0d0bb2030d2e36df73e2d23d5770511dbc8d (diff)
parent924d8696751c4b9e58263bc82efdafcf875596a6 (diff)
Merge branch 'pm-sleep'
* pm-sleep: PM / hibernate: Fix rtree_next_node() to avoid walking off list ends x86/power/64: Use __pa() for physical address computation PM / sleep: Update some system sleep documentation
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/power/hibernate_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index a3e3ccc87138..9634557a5444 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -113,7 +113,7 @@ static int set_up_temporary_mappings(void)
return result;
}
- temp_level4_pgt = (unsigned long)pgd - __PAGE_OFFSET;
+ temp_level4_pgt = __pa(pgd);
return 0;
}