summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/console.c1
-rw-r--r--lib/malloc.c92
2 files changed, 0 insertions, 93 deletions
diff --git a/lib/console.c b/lib/console.c
index b63b6f4dcff2..ecb60b145cbf 100644
--- a/lib/console.c
+++ b/lib/console.c
@@ -2,7 +2,6 @@
#include <hlt.h>
#include <console.h>
#include <uart8250.h>
-// FIXME: we need this for varargs
#include <stdarg.h>
int vtxprintf(void (*)(unsigned char, void *arg),
diff --git a/lib/malloc.c b/lib/malloc.c
deleted file mode 100644
index b9e0370a0952..000000000000
--- a/lib/malloc.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * This file is part of the LinuxBIOS project.
- *
- * Copyright (C) 2007 Ronald G. Minnich <rminnich@gmail.com>
- *
- * This program 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; version 2 of the License.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
- */
-
-/*
- * Simple non-freeing malloc. There have been about a million versions of
- * this but we need one with a known author. Almost every OS and bootloader
- * has had this at some time or other.
- */
-
-#include <types.h>
-#include <stdlib.h>
-#include <console.h>
-
-#if 0
-#define MALLOCDBG(x...)
-#else
-#define MALLOCDBG(x...) printk(BIOS_SPEW, x)
-#endif
-
-/*
- * Instead of ldscript magic, just declare an array. The array will consume
- * no bytes in the image, and it won't run into trouble the way the v2
- * allocator could. We do not provide zero'd memory.
- *
- * Note that the execute-in-place (XIP) code in top of flash is not allowed
- * to call malloc(), since we can't link this in to it. The flash-based code
- * should always be dead simple (in fact, it's not clear we need malloc() at
- * all any more -- we're doing our best to remove all usage of it -- the
- * only real users were elfboot and lzma, and we have removed its usage in
- * elfboot, and will try to remove its usage in lzma).
- */
-
-#define HEAPSIZE (256 * 1024)
-static unsigned char heap[HEAPSIZE];
-static unsigned char *free_mem_ptr = heap;
-static unsigned long freebytes = HEAPSIZE;
-
-/**
- * Allocate 'size' bytes of memory. The memory is not zero'd.
- * If not enough memory is available, just die.
- *
- * @param size The number of bytes to allocate.
- * @return A pointer to the allocated memory.
- */
-void *malloc(size_t size)
-{
- void *p;
-
- MALLOCDBG("%s Enter, size %d, free_mem_ptr %p\n",
- __FUNCTION__, size, free_mem_ptr);
-
- if (size > freebytes) {
- die("Out of memory.\n");
- }
-
- size = (size + 3) & (~3); /* Align */
-
- p = free_mem_ptr;
- free_mem_ptr += size;
- freebytes -= size;
-
- MALLOCDBG("malloc 0x%08lx\n", (unsigned long)p);
-
- return p;
-}
-
-/**
- * Free the specified memory area.
- * This is a no-op, we don't care about freeing memory.
- *
- * @param where A pointer to the memory area to free.
- */
-void free(void *where)
-{
- /* Don't care. */
-}