aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/mm.c
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-08-26 10:35:36 +0000
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-08-26 10:35:36 +0000
commit393415f09c80d9846cba6b7462d152bc0f032ede (patch)
tree3ae768c32dc6ff5d55be75a5263fad1a64a06f6c /extras/mini-os/mm.c
parent4fb2acfb09468669ebbeaa6570d42403bb8ffc4f (diff)
downloadxen-393415f09c80d9846cba6b7462d152bc0f032ede.tar.gz
xen-393415f09c80d9846cba6b7462d152bc0f032ede.tar.bz2
xen-393415f09c80d9846cba6b7462d152bc0f032ede.zip
The patch removes broken, and very complicated malloc in
favour of much simpler (and working) Xen's allocator (xmalloc by Rusty). Signed-off-by: Grzegorz Milos <gm281@cam.ac.uk>
Diffstat (limited to 'extras/mini-os/mm.c')
-rw-r--r--extras/mini-os/mm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/extras/mini-os/mm.c b/extras/mini-os/mm.c
index be5ffcd353..bbbd800f56 100644
--- a/extras/mini-os/mm.c
+++ b/extras/mini-os/mm.c
@@ -1,6 +1,7 @@
-/* -*- Mode:C; c-basic-offset:4; tab-width:4 -*-
+/*
****************************************************************************
* (C) 2003 - Rolf Neugebauer - Intel Research Cambridge
+ * (C) 2005 - Grzegorz Milos - Intel Research Cambridge
****************************************************************************
*
* File: mm.c
@@ -14,8 +15,6 @@
* contains buddy page allocator from Xen.
*
****************************************************************************
- * $Id: c-insert.c,v 1.7 2002/11/08 16:04:34 rn Exp $
- ****************************************************************************
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
@@ -40,7 +39,7 @@
#include <mm.h>
#include <types.h>
#include <lib.h>
-
+#include <xmalloc.h>
#ifdef MM_DEBUG
#define DEBUG(_f, _a...) \
@@ -505,6 +504,6 @@ void init_mm(void)
(u_long)to_virt(PFN_PHYS(max_pfn)), PFN_PHYS(max_pfn));
init_page_allocator(PFN_PHYS(start_pfn), PFN_PHYS(max_pfn));
#endif
-
+
printk("MM: done\n");
}