diff options
| author | Keir Fraser <keir@xen.org> | 2011-01-12 10:53:56 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-01-12 10:53:56 +0000 |
| commit | b10319695ffc18bc75d4643f851357e5b1ec256d (patch) | |
| tree | 6605e8e460e717dab88275f6c512e64ddd0749fe | |
| parent | cce0d574d12d5743091f1c63828d18f4ea5d3648 (diff) | |
| download | xen-b10319695ffc18bc75d4643f851357e5b1ec256d.tar.gz xen-b10319695ffc18bc75d4643f851357e5b1ec256d.tar.bz2 xen-b10319695ffc18bc75d4643f851357e5b1ec256d.zip | |
Revert 22706:ca10302ac285 "xenpaging: update machine_to_phys_mapping[] during page deallocation"
Crashes during boot, due to m2p tables not being set up early enough.
Signed-off-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/common/page_alloc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7e3198c7f9..a3f890f733 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -527,7 +527,7 @@ static int reserve_offlined_page(struct page_info *head) static void free_heap_pages( struct page_info *pg, unsigned int order) { - unsigned long mask, mfn = page_to_mfn(pg); + unsigned long mask; unsigned int i, node = phys_to_nid(page_to_maddr(pg)), tainted = 0; unsigned int zone = page_to_zone(pg); @@ -538,10 +538,6 @@ static void free_heap_pages( for ( i = 0; i < (1 << order); i++ ) { - /* This page is not a guest frame any more. */ - page_set_owner(&pg[i], NULL); /* set_gpfn_from_mfn snoops pg owner */ - set_gpfn_from_mfn(mfn + i, INVALID_M2P_ENTRY); - /* * Cannot assume that count_info == 0, as there are some corner cases * where it isn't the case and yet it isn't a bug: |