Merge branch 'x86/asm' into x86/mm, to resolve conflicts

[cascardo/linux.git] / arch / x86 / boot / boot.h

diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 7c1495f..e5612f3 100644 (file)
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -295,6 +295,7 @@ static inline int cmdline_find_option_bool(const char *option)
 
 /* cpu.c, cpucheck.c */
 int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr);
+int check_knl_erratum(void);
 int validate_cpu(void);
 
 /* early_serial_console.c */