aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/setup.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 6285697b6e56..5c623dfe39d1 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -50,6 +50,7 @@
50#include <linux/init_ohci1394_dma.h> 50#include <linux/init_ohci1394_dma.h>
51#include <linux/kvm_para.h> 51#include <linux/kvm_para.h>
52#include <linux/dma-contiguous.h> 52#include <linux/dma-contiguous.h>
53#include <xen/xen.h>
53 54
54#include <linux/errno.h> 55#include <linux/errno.h>
55#include <linux/kernel.h> 56#include <linux/kernel.h>
@@ -534,6 +535,11 @@ static void __init reserve_crashkernel(void)
534 high = true; 535 high = true;
535 } 536 }
536 537
538 if (xen_pv_domain()) {
539 pr_info("Ignoring crashkernel for a Xen PV domain\n");
540 return;
541 }
542
537 /* 0 means: find the address automatically */ 543 /* 0 means: find the address automatically */
538 if (crash_base <= 0) { 544 if (crash_base <= 0) {
539 /* 545 /*