diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-11-10 14:53:00 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-11-10 14:53:00 +0000 |
| commit | afb74c597365821d7e515d1b7d51066ffe9edd3d (patch) | |
| tree | ffd6a3b794db550ff154e6ef885423c859df6000 /linux-2.6-xen-sparse/include | |
| parent | f5982aac5fe63eb410f40363f6e5162600611908 (diff) | |
| download | xen-afb74c597365821d7e515d1b7d51066ffe9edd3d.tar.gz xen-afb74c597365821d7e515d1b7d51066ffe9edd3d.tar.bz2 xen-afb74c597365821d7e515d1b7d51066ffe9edd3d.zip | |
Revert 12361:32f7b40ace426d3acdf26c21c20cb6b4562d9f10.
We should support the XENMEM_memory_map hypercall properly
to fix this issue.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'linux-2.6-xen-sparse/include')
| -rw-r--r-- | linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h index 2ea18f44eb..7314dedbde 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h @@ -13,7 +13,6 @@ static char * __init machine_specific_memory_setup(void) { int rc; struct xen_memory_map memmap; - unsigned long arg = DOMID_SELF; /* * This is rather large for a stack variable but this early in * the boot process we know we have plenty slack space. @@ -24,14 +23,9 @@ static char * __init machine_specific_memory_setup(void) set_xen_guest_handle(memmap.buffer, map); rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); - if (rc == -ENOSYS) { + if ( rc == -ENOSYS ) { memmap.nr_entries = 1; map[0].addr = 0ULL; - rc = HYPERVISOR_memory_op(XENMEM_maximum_reservation, &arg); - if (rc < 0) - map[0].size = PFN_PHYS(xen_start_info->nr_pages); - else - map[0].size = PFN_PHYS(rc); map[0].size = PFN_PHYS(xen_start_info->nr_pages); /* 8MB slack (to balance backend allocations). */ map[0].size += 8ULL << 20; |