Commit 701a261a authored Jan 07, 2015 by Boris Ostrovsky Committed by David Vrabel Jan 08, 2015

x86/xen: Free bootmem in free_p2m_page() during early boot



With recent changes in p2m we now have legitimate cases when
p2m memory needs to be freed during early boot (i.e. before
slab is initialized).

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

parent 8b8cd8a3

arch/x86/xen/p2m.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -167,10 +167,13 @@ static void * __ref alloc_p2m_page(void)
		return (void *)__get_free_page(GFP_KERNEL \| __GFP_REPEAT);
		}

		/* Only to be called in case of a race for a page just allocated! */
		static void free_p2m_page(void *p)
		static void __ref free_p2m_page(void *p)
		{
		BUG_ON(!slab_is_available());
		if (unlikely(!slab_is_available())) {
		free_bootmem((unsigned long)p, PAGE_SIZE);
		return;
		}

		free_page((unsigned long)p);
		}