Merge tag 'md/4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

[sfrench/cifs-2.6.git] / arch / um / kernel / physmem.c

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