aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/power/hibernate_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/power/hibernate_64.c')
-rw-r--r--arch/x86/power/hibernate_64.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index e3e62c8a8e70..f2598d81cd55 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -147,7 +147,7 @@ static int relocate_restore_code(void)
147 if (!relocated_restore_code) 147 if (!relocated_restore_code)
148 return -ENOMEM; 148 return -ENOMEM;
149 149
150 memcpy((void *)relocated_restore_code, &core_restore_code, PAGE_SIZE); 150 memcpy((void *)relocated_restore_code, core_restore_code, PAGE_SIZE);
151 151
152 /* Make the page containing the relocated code executable */ 152 /* Make the page containing the relocated code executable */
153 pgd = (pgd_t *)__va(read_cr3_pa()) + 153 pgd = (pgd_t *)__va(read_cr3_pa()) +
@@ -293,8 +293,8 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size)
293 293
294 if (max_size < sizeof(struct restore_data_record)) 294 if (max_size < sizeof(struct restore_data_record))
295 return -EOVERFLOW; 295 return -EOVERFLOW;
296 rdr->jump_address = (unsigned long)&restore_registers; 296 rdr->jump_address = (unsigned long)restore_registers;
297 rdr->jump_address_phys = __pa_symbol(&restore_registers); 297 rdr->jump_address_phys = __pa_symbol(restore_registers);
298 rdr->cr3 = restore_cr3; 298 rdr->cr3 = restore_cr3;
299 rdr->magic = RESTORE_MAGIC; 299 rdr->magic = RESTORE_MAGIC;
300 300