diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 07:46:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 07:46:48 -0700 |
| commit | 115452675361dbef2dfb59f4cbd922637be3dc5b (patch) | |
| tree | 693b1e1f3526d5b4d0881c786726b71934aa3dcc /arch/x86/xen/smp.c | |
| parent | 768b56f598694ed7215723d402ca3b388106b042 (diff) | |
| parent | ed467e69f16e6b480e2face7bc5963834d025f91 (diff) | |
| download | op-kernel-dev-115452675361dbef2dfb59f4cbd922637be3dc5b.zip op-kernel-dev-115452675361dbef2dfb59f4cbd922637be3dc5b.tar.gz | |
Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen
* 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen:
xen/smp: Warn user why they keel over - nosmp or noapic and what to use instead.
xen: x86_32: do not enable iterrupts when returning from exception in interrupt context
xen: use maximum reservation to limit amount of usable RAM
Diffstat (limited to 'arch/x86/xen/smp.c')
| -rw-r--r-- | arch/x86/xen/smp.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index e79dbb9..d4fc6d4 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -32,6 +32,7 @@ #include <xen/page.h> #include <xen/events.h> +#include <xen/hvc-console.h> #include "xen-ops.h" #include "mmu.h" @@ -207,6 +208,15 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus) unsigned cpu; unsigned int i; + if (skip_ioapic_setup) { + char *m = (max_cpus == 0) ? + "The nosmp parameter is incompatible with Xen; " \ + "use Xen dom0_max_vcpus=1 parameter" : + "The noapic parameter is incompatible with Xen"; + + xen_raw_printk(m); + panic(m); + } xen_init_lock_cpu(0); smp_store_cpu_info(0); |
