Merge branch 'upstream-merged'

1 files changed, 28 insertions, 0 deletions

diff --git a/libdde-linux26/lib/src/arch/l4/vmalloc.c b/libdde-linux26/lib/src/arch/l4/vmalloc.c
new file mode 100644
index 00000000..4fa063f0
--- /dev/null
+++ b/libdde-linux26/lib/src/arch/l4/vmalloc.c
@@ -0,0 +1,28 @@
+/******************************************************************************
+ * Bjoern Doebel <doebel@tudos.org>                                           *
+ *                                                                            *
+ * (c) 2005 - 2007 Technische Universitaet Dresden                            *
+ * This file is part of DROPS, which is distributed under the terms of the    *
+ * GNU General Public License 2. Please see the COPYING file for details.     *
+ ******************************************************************************/
+
+/*
+ * \brief    vmalloc implementation
+ * \author   Bjoern Doebel
+ * \date     2007-07-30
+ */
+
+/* Linux */
+#include <linux/vmalloc.h>
+
+#include "local.h"
+
+void *vmalloc(unsigned long size)
+{
+	return ddekit_simple_malloc(size);
+}
+
+void vfree(const void *addr)
+{
+	ddekit_simple_free((void*)addr);
+}