um: setup_physmem: stop using global variables

[linux-2.6-microblaze.git] / arch / um / kernel / physmem.c

diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index f02596e..0eaec0e 100644 (file)
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -86,7 +86,7 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end,
        long map_size;
        int err;
 
-       offset = uml_reserved - uml_physmem;
+       offset = reserve_end - start;
        map_size = len - offset;
        if(map_size <= 0) {
                os_warn("Too few physical memory! Needed=%lu, given=%lu\n",
@@ -96,12 +96,12 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end,
 
        physmem_fd = create_mem_file(len + highmem);
 
-       err = os_map_memory((void *) uml_reserved, physmem_fd, offset,
+       err = os_map_memory((void *) reserve_end, physmem_fd, offset,
                            map_size, 1, 1, 1);
        if (err < 0) {
                os_warn("setup_physmem - mapping %ld bytes of memory at 0x%p "
                        "failed - errno = %d\n", map_size,
-                       (void *) uml_reserved, err);
+                       (void *) reserve_end, err);
                exit(1);
        }