aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/include/xmalloc.h
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-12-08 15:24:02 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-12-08 15:24:02 +0100
commit7fc4533b321fbe7ef6ce0ef05e3b99cebe13a39e (patch)
treeb862d841d85f51754110df948f0b471c5e4583de /extras/mini-os/include/xmalloc.h
parentbc70813814bf808d64f0331c2e450662058e07a7 (diff)
downloadxen-7fc4533b321fbe7ef6ce0ef05e3b99cebe13a39e.tar.gz
xen-7fc4533b321fbe7ef6ce0ef05e3b99cebe13a39e.tar.bz2
xen-7fc4533b321fbe7ef6ce0ef05e3b99cebe13a39e.zip
Merge in the newer Xenbus implementation from Linux to the Mini-OS. The new
version compiles and starts up, but I'm not really sure how to test the new xenbus implementation. * Added unbind_evtchn * Copied parts of the Linux spinlock implementation to make the changes to xenbus compared to Linux smaller. Also added a dummy rwsem implementation. * Updated the xenbus-files Signed-off-by: Simon Kagstrom <simon.kagstrom@bth.se>
Diffstat (limited to 'extras/mini-os/include/xmalloc.h')
-rw-r--r--extras/mini-os/include/xmalloc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/extras/mini-os/include/xmalloc.h b/extras/mini-os/include/xmalloc.h
index e29a0387fc..f5e721fa16 100644
--- a/extras/mini-os/include/xmalloc.h
+++ b/extras/mini-os/include/xmalloc.h
@@ -7,6 +7,9 @@
/* Allocate space for array of typed objects. */
#define xmalloc_array(_type, _num) ((_type *)_xmalloc_array(sizeof(_type), __alignof__(_type), _num))
+#define malloc(size) _xmalloc(size, 4)
+#define free(ptr) xfree(ptr)
+
/* Free any of the above. */
extern void xfree(const void *);