diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:05:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:05:09 +0100 |
| commit | f01ec4fca8207e31b59a010c3de679c833f3a877 (patch) | |
| tree | 668813e1fe0dfffa5535b7531ba6ed489c912831 /arch/x86/include/asm/processor.h | |
| parent | x86/entry/64: Remove pointless jump in paranoid_exit (diff) | |
| parent | x86/build/vdso: Remove meaningless CFLAGS_REMOVE_*.o (diff) | |
| download | linux-f01ec4fca8207e31b59a010c3de679c833f3a877.tar.gz linux-f01ec4fca8207e31b59a010c3de679c833f3a877.zip | |
Merge branch 'x86/build' into x86/asm, to pick up completed topic branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 6e0a3b43d027..790f250d39a8 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -958,7 +958,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves) extern unsigned long arch_align_stack(unsigned long sp); void free_init_pages(const char *what, unsigned long begin, unsigned long end); -extern void free_kernel_image_pages(void *begin, void *end); +extern void free_kernel_image_pages(const char *what, void *begin, void *end); void default_idle(void); #ifdef CONFIG_XEN |