diff --git a/[refs] b/[refs] index c5810c9f396c..41251c545575 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49e9d557f9b6e9639390b63b645f2def8dde5f1b +refs/heads/master: 624d84cfe63b5afdd087bf5b2075a8a8cac5c83f diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c index c7a57b4feb39..b8499f544e1d 100644 --- a/trunk/virt/kvm/kvm_main.c +++ b/trunk/virt/kvm/kvm_main.c @@ -2022,7 +2022,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void) /* spin while reset goes on */ local_irq_enable(); while (true) - ; + cpu_relax(); } /* Fault while not rebooting. We want the trace. */ BUG();