diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2003-10-15 09:31:04 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2003-10-15 09:31:04 +0000 |
| commit | d47201cc4f2bc9cbaae0bfab32cf8a1b917f153d (patch) | |
| tree | 9fba304138611ee59cb6fc18f1e2a8bdef56e562 /extras/mini-os/lib | |
| parent | 6841936e92562a7b2587f9c167e4c6483bfe1150 (diff) | |
| download | xen-d47201cc4f2bc9cbaae0bfab32cf8a1b917f153d.tar.gz xen-d47201cc4f2bc9cbaae0bfab32cf8a1b917f153d.tar.bz2 xen-d47201cc4f2bc9cbaae0bfab32cf8a1b917f153d.zip | |
bitkeeper revision 1.520 (3f8d13d8qVVqxcYD--4cXYs5egqNyg)
Many files:
Fix the minos license so that it is usable for XP and BSD ports.
minios.lds:
Rename: extras/mini-os/vmlinux.lds -> extras/mini-os/minios.lds
.del-list.h~d612a8726e8d42e:
Delete: extras/mini-os/h/list.h
.del-COPYING~1f9753354580bd13:
Delete: extras/mini-os/COPYING
Diffstat (limited to 'extras/mini-os/lib')
| -rw-r--r-- | extras/mini-os/lib/malloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extras/mini-os/lib/malloc.c b/extras/mini-os/lib/malloc.c index 003c086858..c231eb7e86 100644 --- a/extras/mini-os/lib/malloc.c +++ b/extras/mini-os/lib/malloc.c @@ -51,17 +51,17 @@ static void *more_core(size_t n) if (n == 0) return last; - /* get pages */ - order = get_order(n); - ret = (void *)get_free_pages(order); + n = PFN_UP(n); + for ( order = 0; n > 1; order++ ) + n >>= 1; + ret = (void *)alloc_pages(order); /* work out pointer to end of chunk */ - if (ret) { + if ( ret ) + { num_pages = 1 << order; last = ret + (num_pages * PAGE_SIZE); } - - //printk("malloc(%lu) -> o=%lu r=%p, l=%p", n, order, ret, last); return ret; } |