diff options
Diffstat (limited to 'include/asm-i386/bugs.h')
| -rw-r--r-- | include/asm-i386/bugs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h index 592ffeeda45e..38f1aebbbdb5 100644 --- a/include/asm-i386/bugs.h +++ b/include/asm-i386/bugs.h | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <asm/processor.h> | 21 | #include <asm/processor.h> |
| 22 | #include <asm/i387.h> | 22 | #include <asm/i387.h> |
| 23 | #include <asm/msr.h> | 23 | #include <asm/msr.h> |
| 24 | #include <asm/paravirt.h> | ||
| 24 | 25 | ||
| 25 | static int __init no_halt(char *s) | 26 | static int __init no_halt(char *s) |
| 26 | { | 27 | { |
| @@ -91,6 +92,9 @@ static void __init check_fpu(void) | |||
| 91 | 92 | ||
| 92 | static void __init check_hlt(void) | 93 | static void __init check_hlt(void) |
| 93 | { | 94 | { |
| 95 | if (paravirt_enabled()) | ||
| 96 | return; | ||
| 97 | |||
| 94 | printk(KERN_INFO "Checking 'hlt' instruction... "); | 98 | printk(KERN_INFO "Checking 'hlt' instruction... "); |
| 95 | if (!boot_cpu_data.hlt_works_ok) { | 99 | if (!boot_cpu_data.hlt_works_ok) { |
| 96 | printk("disabled\n"); | 100 | printk("disabled\n"); |
