diff options
author | Ingo Molnar | 2018-12-17 18:48:25 +0100 |
---|---|---|
committer | Ingo Molnar | 2018-12-17 18:48:25 +0100 |
commit | 02117e42db7470e59910088b2b0ee42d581d2651 (patch) | |
tree | 7734414b46fb72ffc708ac924f3b6b69de1f0d4c /arch/x86/include/asm/x86_init.h | |
parent | x86/mm: Drop usage of __flush_tlb_all() in kernel_physical_mapping_init() (diff) | |
parent | x86/mm/cpa: Fix cpa_flush_array() TLB invalidation (diff) | |
download | kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.tar.gz kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.tar.xz kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.zip |
Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/x86_init.h')
-rw-r--r-- | arch/x86/include/asm/x86_init.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index 0f842104862c..b85a7c54c6a1 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -303,6 +303,4 @@ extern void x86_init_noop(void); extern void x86_init_uint_noop(unsigned int unused); extern bool x86_pnpbios_disabled(void); -void x86_verify_bootdata_version(void); - #endif |