diff --git a/[refs] b/[refs] index b4d18ddc03e7..5043a491b628 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6025a79f5d438bba0186fbb230dc780e876edf2 +refs/heads/master: b463fc60730bea6cdd73fec6edc6ec4658d47d37 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index 595fb771366e..4ea31c327d1f 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -205,7 +205,7 @@ config PARAVIRT config VMI bool "VMI Paravirt-ops support" - depends on PARAVIRT + depends on PARAVIRT && !NO_HZ default y help VMI provides a paravirtualized interface to multiple hypervisors