diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-08-18 03:27:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-08-18 03:27:08 +0200 |
| commit | 6c16f42a4e01ef1543fb21e594c2b25d00697649 (patch) | |
| tree | a99d0e3f5831a4f2cef3e4266a034561185a1213 /arch | |
| parent | Linux 4.8-rc2 (diff) | |
| parent | PM / hibernate: Fix rtree_next_node() to avoid walking off list ends (diff) | |
| download | linux-dev-6c16f42a4e01ef1543fb21e594c2b25d00697649.tar.xz linux-dev-6c16f42a4e01ef1543fb21e594c2b25d00697649.zip | |
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')
| -rw-r--r-- | arch/x86/power/hibernate_64.c | 2 |
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; } |