diff --git a/[refs] b/[refs] index cb66c3ed421c..067cc5c28360 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f14ddc3a7146ea4cd5a3d1ecd993f85f2e4f948 +refs/heads/master: 86b32122fd54addc9af01f8b919c65d3f49090a3 diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c index 2a4add9634ce..010ba2e62de5 100644 --- a/trunk/arch/x86/xen/setup.c +++ b/trunk/arch/x86/xen/setup.c @@ -200,7 +200,8 @@ char * __init xen_memory_setup(void) * used as potential resource for I/O address (happens * when 'allocate_resource' is called). */ - if (delta && end < 0x100000000UL) + if (delta && + (xen_initial_domain() && end < 0x100000000ULL)) e820_add_region(end, delta, E820_UNUSABLE); }