|
@@ -21,6 +21,7 @@
|
|
#include <asm/processor.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/i387.h>
|
|
#include <asm/i387.h>
|
|
#include <asm/msr.h>
|
|
#include <asm/msr.h>
|
|
|
|
+#include <asm/paravirt.h>
|
|
|
|
|
|
static int __init no_halt(char *s)
|
|
static int __init no_halt(char *s)
|
|
{
|
|
{
|
|
@@ -91,6 +92,9 @@ static void __init check_fpu(void)
|
|
|
|
|
|
static void __init check_hlt(void)
|
|
static void __init check_hlt(void)
|
|
{
|
|
{
|
|
|
|
+ if (paravirt_enabled())
|
|
|
|
+ return;
|
|
|
|
+
|
|
printk(KERN_INFO "Checking 'hlt' instruction... ");
|
|
printk(KERN_INFO "Checking 'hlt' instruction... ");
|
|
if (!boot_cpu_data.hlt_works_ok) {
|
|
if (!boot_cpu_data.hlt_works_ok) {
|
|
printk("disabled\n");
|
|
printk("disabled\n");
|