Merge branch 'upstream-merged'

1 files changed, 49 insertions, 0 deletions

diff --git a/libddekit/malloc.c b/libddekit/malloc.c
new file mode 100644
index 00000000..a30cd7b7
--- /dev/null
+++ b/libddekit/malloc.c
@@ -0,0 +1,49 @@
+/* 
+   Copyright (C) 2009 Free Software Foundation, Inc.
+   Written by Zheng Da.
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   The GNU Hurd is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with the GNU Hurd; see the file COPYING.  If not, write to
+   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/**
+ * Allocate memory block via simple allocator
+ *
+ * \param size  block size
+ * \return pointer to new memory block
+ *
+ * The blocks allocated via this allocator CANNOT be used for DMA or other
+ * device operations, i.e., there exists no virt->phys mapping.
+ *
+ * Each chunk stores its size in the first word for free() to work.
+ */
+
+#include <stdlib.h>
+
+void *ddekit_simple_malloc(unsigned size)
+{
+  return malloc (size);
+}
+
+
+/**
+ * Free memory block via simple allocator
+ *
+ * \param p  pointer to memory block
+ */
+void ddekit_simple_free(void *p)
+{
+  free (p);
+}