ARM: SAMSUNG: Move mach/ts.h to plat/ts.h

[safe/jmp/linux-2.6] / arch / um / kernel / physmem.c

diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index fb695e4..a1a9090 100644 (file)
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -10,7 +10,7 @@
 #include "as-layout.h"
 #include "init.h"
 #include "kern.h"
-#include "mode_kern.h"
+#include "mem_user.h"
 #include "os.h"
 
 static int physmem_fd = -1;
@@ -55,16 +55,6 @@ int __init init_maps(unsigned long physmem, unsigned long iomem,
        return 0;
 }
 
-/* Changed during early boot */
-static unsigned long kmem_top = 0;
-
-unsigned long get_kmem_end(void)
-{
-       if (kmem_top == 0)
-               kmem_top = CHOOSE_MODE(kmem_end_tt, kmem_end_skas);
-       return kmem_top;
-}
-
 void map_memory(unsigned long virt, unsigned long phys, unsigned long len,
                int r, int w, int x)
 {
@@ -75,7 +65,7 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len,
        err = os_map_memory((void *) virt, fd, offset, len, r, w, x);
        if (err) {
                if (err == -ENOMEM)
-                       printk("try increasing the host's "
+                       printk(KERN_ERR "try increasing the host's "
                               "/proc/sys/vm/max_map_count to <physical "
                               "memory size>/4096\n");
                panic("map_memory(0x%lx, %d, 0x%llx, %ld, %d, %d, %d) failed, "
@@ -99,11 +89,14 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end,
        err = os_map_memory((void *) uml_reserved, physmem_fd, offset,
                            len - offset, 1, 1, 1);
        if (err < 0) {
-               os_print_error(err, "Mapping memory");
+               printf("setup_physmem - mapping %ld bytes of memory at 0x%p "
+                      "failed - errno = %d\n", len - offset,
+                      (void *) uml_reserved, err);
                exit(1);
        }
 
-       /* Special kludge - This page will be mapped in to userspace processes
+       /*
+        * Special kludge - This page will be mapped in to userspace processes
         * from physmem_fd, so it needs to be written out there.
         */
        os_seek_file(physmem_fd, __pa(&__syscall_stub_start));
@@ -114,7 +107,7 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end,
                     len - bootmap_size - reserve);
 }
 
-int phys_mapping(unsigned long phys, __u64 *offset_out)
+int phys_mapping(unsigned long phys, unsigned long long *offset_out)
 {
        int fd = -1;
 
@@ -171,10 +164,10 @@ __uml_setup("iomem=", parse_iomem,
  * setup_iomem, both of which run during early boot.  Afterwards, it's
  * unchanged.
  */
-struct iomem_region *iomem_regions = NULL;
+struct iomem_region *iomem_regions;
 
-/* Initialized in parse_iomem */
-int iomem_size = 0;
+/* Initialized in parse_iomem and unchanged thereafter */
+int iomem_size;
 
 unsigned long find_iomem(char *driver, unsigned long *len_out)
 {
@@ -192,7 +185,7 @@ unsigned long find_iomem(char *driver, unsigned long *len_out)
        return 0;
 }
 
-int setup_iomem(void)
+static int setup_iomem(void)
 {
        struct iomem_region *region = iomem_regions;
        unsigned long iomem_start = high_physmem + PAGE_SIZE;
@@ -202,8 +195,8 @@ int setup_iomem(void)
                err = os_map_memory((void *) iomem_start, region->fd, 0,
                                    region->size, 1, 1, 0);
                if (err)
-                       printk("Mapping iomem region for driver '%s' failed, "
-                              "errno = %d\n", region->driver, -err);
+                       printk(KERN_ERR "Mapping iomem region for driver '%s' "
+                              "failed, errno = %d\n", region->driver, -err);
                else {
                        region->virt = iomem_start;
                        region->phys = __pa(region->virt);