---

yaml
---
r: 217863
b: refs/heads/master
c: 9e9a5fc
h: refs/heads/master
i:
  217861: 4872392
  217859: 1853c8c
  217855: be1545d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 375b2a9ada6d105483aab22f1af1d727bc3c418d
+refs/heads/master: 9e9a5fcb04e3af077d1be32710298b852210d93f

trunk/arch/x86/xen/setup.c

@@ -149,14 +149,18 @@ char * __init xen_memory_setup(void)
 	unsigned long extra_pages = 0;
 	unsigned long extra_limit;
 	int i;
+	int op;
 
 	max_pfn = min(MAX_DOMAIN_PAGES, max_pfn);
 	mem_end = PFN_PHYS(max_pfn);
 
 	memmap.nr_entries = E820MAX;
 	set_xen_guest_handle(memmap.buffer, map);
 
-	rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
+	op = xen_initial_domain() ?
+		XENMEM_machine_memory_map :
+		XENMEM_memory_map;
+	rc = HYPERVISOR_memory_op(op, &memmap);
 	if (rc == -ENOSYS) {
 		memmap.nr_entries = 1;
 		map[0].addr = 0ULL;
@@ -235,7 +239,8 @@ char * __init xen_memory_setup(void)
 	else
 		extra_pages = 0;
 
-	xen_add_extra_mem(extra_pages);
+	if (!xen_initial_domain())
+		xen_add_extra_mem(extra_pages);
 
 	return "Xen";
 }