diff options
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index ee99b77e4451..7f686251f711 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -90,7 +90,8 @@ static void hardware_disable_all(void); | |||
90 | 90 | ||
91 | static void kvm_io_bus_destroy(struct kvm_io_bus *bus); | 91 | static void kvm_io_bus_destroy(struct kvm_io_bus *bus); |
92 | 92 | ||
93 | static bool kvm_rebooting; | 93 | bool kvm_rebooting; |
94 | EXPORT_SYMBOL_GPL(kvm_rebooting); | ||
94 | 95 | ||
95 | static bool largepages_enabled = true; | 96 | static bool largepages_enabled = true; |
96 | 97 | ||
@@ -2171,18 +2172,12 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, | |||
2171 | } | 2172 | } |
2172 | 2173 | ||
2173 | 2174 | ||
2174 | asmlinkage void kvm_handle_fault_on_reboot(void) | 2175 | asmlinkage void kvm_spurious_fault(void) |
2175 | { | 2176 | { |
2176 | if (kvm_rebooting) { | ||
2177 | /* spin while reset goes on */ | ||
2178 | local_irq_enable(); | ||
2179 | while (true) | ||
2180 | cpu_relax(); | ||
2181 | } | ||
2182 | /* Fault while not rebooting. We want the trace. */ | 2177 | /* Fault while not rebooting. We want the trace. */ |
2183 | BUG(); | 2178 | BUG(); |
2184 | } | 2179 | } |
2185 | EXPORT_SYMBOL_GPL(kvm_handle_fault_on_reboot); | 2180 | EXPORT_SYMBOL_GPL(kvm_spurious_fault); |
2186 | 2181 | ||
2187 | static int kvm_reboot(struct notifier_block *notifier, unsigned long val, | 2182 | static int kvm_reboot(struct notifier_block *notifier, unsigned long val, |
2188 | void *v) | 2183 | void *v) |