diff options
Diffstat (limited to 'arch/um/kernel/physmem.c')
-rw-r--r-- | arch/um/kernel/physmem.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 90e89e838173..a55d221d8a4c 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c | |||
@@ -75,7 +75,7 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len, | |||
75 | err = os_map_memory((void *) virt, fd, offset, len, r, w, x); | 75 | err = os_map_memory((void *) virt, fd, offset, len, r, w, x); |
76 | if (err) { | 76 | if (err) { |
77 | if (err == -ENOMEM) | 77 | if (err == -ENOMEM) |
78 | printk("try increasing the host's " | 78 | printk(KERN_ERR "try increasing the host's " |
79 | "/proc/sys/vm/max_map_count to <physical " | 79 | "/proc/sys/vm/max_map_count to <physical " |
80 | "memory size>/4096\n"); | 80 | "memory size>/4096\n"); |
81 | panic("map_memory(0x%lx, %d, 0x%llx, %ld, %d, %d, %d) failed, " | 81 | panic("map_memory(0x%lx, %d, 0x%llx, %ld, %d, %d, %d) failed, " |
@@ -103,7 +103,8 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end, | |||
103 | exit(1); | 103 | exit(1); |
104 | } | 104 | } |
105 | 105 | ||
106 | /* Special kludge - This page will be mapped in to userspace processes | 106 | /* |
107 | * Special kludge - This page will be mapped in to userspace processes | ||
107 | * from physmem_fd, so it needs to be written out there. | 108 | * from physmem_fd, so it needs to be written out there. |
108 | */ | 109 | */ |
109 | os_seek_file(physmem_fd, __pa(&__syscall_stub_start)); | 110 | os_seek_file(physmem_fd, __pa(&__syscall_stub_start)); |
@@ -202,8 +203,8 @@ int setup_iomem(void) | |||
202 | err = os_map_memory((void *) iomem_start, region->fd, 0, | 203 | err = os_map_memory((void *) iomem_start, region->fd, 0, |
203 | region->size, 1, 1, 0); | 204 | region->size, 1, 1, 0); |
204 | if (err) | 205 | if (err) |
205 | printk("Mapping iomem region for driver '%s' failed, " | 206 | printk(KERN_ERR "Mapping iomem region for driver '%s' " |
206 | "errno = %d\n", region->driver, -err); | 207 | "failed, errno = %d\n", region->driver, -err); |
207 | else { | 208 | else { |
208 | region->virt = iomem_start; | 209 | region->virt = iomem_start; |
209 | region->phys = __pa(region->virt); | 210 | region->phys = __pa(region->virt); |