diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 15:21:33 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 15:21:33 +0300 |
| commit | 301f8d7463b1f3d1fdb56ee1cb4abb674094531d (patch) | |
| tree | f3aa2695f655a6b628634c14d6de88b1992151e3 /arch/x86/include | |
| parent | f1c7842e5fdd81363643debcd04c5e9b9a55325a (diff) | |
| parent | 59494fe2c89e46e85d83de9bc45dd1d528955c49 (diff) | |
| download | linux-301f8d7463b1f3d1fdb56ee1cb4abb674094531d.tar.xz | |
Merge branch 'pm-sleep'
* pm-sleep:
PM: hibernate: constify attribute_group structures.
PM / hibernate: Drop redundant parameter of swsusp_alloc()
PM / hibernate: Use CONFIG_HAVE_SET_MEMORY for include condition
x86/power/64: Use char arrays for asm function names
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/suspend_64.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/suspend_64.h b/arch/x86/include/asm/suspend_64.h index 6136a18152af..2bd96b4df140 100644 --- a/arch/x86/include/asm/suspend_64.h +++ b/arch/x86/include/asm/suspend_64.h @@ -42,8 +42,7 @@ struct saved_context { set_debugreg((thread)->debugreg##register, register) /* routines for saving/restoring kernel state */ -extern int acpi_save_state_mem(void); -extern char core_restore_code; -extern char restore_registers; +extern char core_restore_code[]; +extern char restore_registers[]; #endif /* _ASM_X86_SUSPEND_64_H */ |