# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 43e8e30cbea71d59c718ad497423cd772e2a608f
# Parent 4b30296d6f5d5ebc5b5353dd078ef5a5d89560e1
# Parent b522a3a4d525b1b5ead7617915a6fec23fd07dba
manual merge
diff -r 4b30296d6f5d -r 43e8e30cbea7 tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c Wed Jul 6 17:28:12 2005
+++ b/tools/libxc/xc_linux_build.c Wed Jul 6 18:19:06 2005
@@ -129,16 +129,16 @@
vinitrd_end = vinitrd_start + initrd_len;
vphysmap_start = round_pgup(vinitrd_end);
vphysmap_end = vphysmap_start + (nr_pages * sizeof(unsigned long));
- vpt_start = round_pgup(vphysmap_end);
+ vstoreinfo_start = round_pgup(vphysmap_end);
+ vstoreinfo_end = vstoreinfo_start + PAGE_SIZE;
+ vpt_start = vstoreinfo_end;
+
for ( nr_pt_pages = 2; ; nr_pt_pages++ )
{
vpt_end = vpt_start + (nr_pt_pages * PAGE_SIZE);
vstartinfo_start = vpt_end;
vstartinfo_end = vstartinfo_start + PAGE_SIZE;
- /* Place store shared page after startinfo. */
- vstoreinfo_start = vstartinfo_end;
- vstoreinfo_end = vstartinfo_end + PAGE_SIZE;
- vstack_start = vstoreinfo_end;
+ vstack_start = vstartinfo_end;
vstack_end = vstack_start + PAGE_SIZE;
v_end = (vstack_end + (1UL<<22)-1) & ~((1UL<<22)-1);
if ( (v_end - vstack_end) < (512UL << 10) )
@@ -167,17 +167,17 @@
" Loaded kernel: %p->%p\n"
" Init. ramdisk: %p->%p\n"
" Phys-Mach map: %p->%p\n"
+ " Store page: %p->%p\n"
" Page tables: %p->%p\n"
" Start info: %p->%p\n"
- " Store page: %p->%p\n"
" Boot stack: %p->%p\n"
" TOTAL: %p->%p\n",
_p(dsi.v_kernstart), _p(dsi.v_kernend),
_p(vinitrd_start), _p(vinitrd_end),
_p(vphysmap_start), _p(vphysmap_end),
+ _p(vstoreinfo_start), _p(vstoreinfo_end),
_p(vpt_start), _p(vpt_end),
_p(vstartinfo_start), _p(vstartinfo_end),
- _p(vstoreinfo_start), _p(vstoreinfo_end),
_p(vstack_start), _p(vstack_end),
_p(dsi.v_start), _p(v_end));
printf(" ENTRY ADDRESS: %p\n", _p(dsi.v_kernentry));
diff -r 4b30296d6f5d -r 43e8e30cbea7
linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c Wed Jul 6
17:28:12 2005
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c Wed Jul 6
18:19:06 2005
@@ -219,9 +219,7 @@
op.ref = ref;
op.dom = domid;
- if(unlikely(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op,
1))) {
- BUG();
- }
+ BUG_ON( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1) );
handle = op.handle;
@@ -231,10 +229,6 @@
vfree(vma->addr);
return;
}
-
- phys_to_machine_mapping[__pa(VMALLOC_VMADDR(vma->addr)) >>
- PAGE_SHIFT] =
- FOREIGN_FRAME(shmem_frame);
blkif->shmem_ref = ref;
blkif->shmem_handle = handle;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home