diff options
| author | Kees Cook | 2017-05-09 23:00:51 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2017-06-22 03:10:12 +0200 |
| commit | c0944883c97c0ddc71da67cc731590a7c878a1a2 (patch) | |
| tree | a417cfd4da063f8071650c3667b5e901942b37c9 /arch/x86/include/asm/suspend_64.h | |
| parent | Linux 4.12-rc6 (diff) | |
| download | kernel-qcow2-linux-c0944883c97c0ddc71da67cc731590a7c878a1a2.tar.gz kernel-qcow2-linux-c0944883c97c0ddc71da67cc731590a7c878a1a2.tar.xz kernel-qcow2-linux-c0944883c97c0ddc71da67cc731590a7c878a1a2.zip | |
x86/power/64: Use char arrays for asm function names
This switches the hibernate_64.S function names into character arrays
to match other areas of the kernel where this is done (e.g., linker
scripts). Specifically this fixes a compile-time error noticed by the
future CONFIG_FORTIFY_SOURCE routines that complained about PAGE_SIZE
being copied out of the "single byte" core_restore_code variable.
Additionally drops the "acpi_save_state_mem" exern which does not
appear to be used anywhere else in the kernel.
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/include/asm/suspend_64.h')
| -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 */ |