diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-04 11:43:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-04 11:43:30 -0800 |
| commit | 0a646e9c992e4846665dc995c86f30c599cda64c (patch) | |
| tree | c403485e5093b1016e5c70ce04a555201e7056f3 /kernel | |
| parent | f74a127f667faa9691ed3c4d584134a7a21a8647 (diff) | |
| parent | 328008a72d38b5bde6491e463405c34a81a65d3e (diff) | |
| download | linux-0a646e9c992e4846665dc995c86f30c599cda64c.tar.bz2 | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"A small set of changes:
- a fixup for kexec related to 5-level paging mode. That covers most
of the cases except kexec from a 5-level kernel to a 4-level
kernel. The latter needs more work and is going to come in 4.17
- two trivial fixes for build warnings triggered by LTO and gcc-8"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/power: Fix swsusp_arch_resume prototype
x86/dumpstack: Avoid uninitlized variable
x86/kexec: Make kexec (mostly) work in 5-level paging mode
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/power.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index f29cd178df90..9e58bdc8a562 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -104,9 +104,6 @@ extern int in_suspend; extern dev_t swsusp_resume_device; extern sector_t swsusp_resume_block; -extern asmlinkage int swsusp_arch_suspend(void); -extern asmlinkage int swsusp_arch_resume(void); - extern int create_basic_memory_bitmaps(void); extern void free_basic_memory_bitmaps(void); extern int hibernate_preallocate_memory(void); |