git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
um
/
drivers
/
mmapper_kern.c
diff --git
a/arch/um/drivers/mmapper_kern.c
b/arch/um/drivers/mmapper_kern.c
index
628d8f8
..
a63231d
100644
(file)
--- a/
arch/um/drivers/mmapper_kern.c
+++ b/
arch/um/drivers/mmapper_kern.c
@@
-8,6
+8,8
@@
* Greg Lonnon glonnon@ridgerun.com or info@ridgerun.com
*
*/
* Greg Lonnon glonnon@ridgerun.com or info@ridgerun.com
*
*/
+
+#include <linux/types.h>
#include <linux/kdev_t.h>
#include <linux/time.h>
#include <linux/devfs_fs_kernel.h>
#include <linux/kdev_t.h>
#include <linux/time.h>
#include <linux/devfs_fs_kernel.h>
@@
-81,10
+83,10
@@
mmapper_mmap(struct file *file, struct vm_area_struct * vma)
size = vma->vm_end - vma->vm_start;
if(size > mmapper_size) return(-EFAULT);
size = vma->vm_end - vma->vm_start;
if(size > mmapper_size) return(-EFAULT);
- /* XXX A comment above remap_p
age
_range says it should only be
+ /* XXX A comment above remap_p
fn
_range says it should only be
* called when the mm semaphore is held
*/
* called when the mm semaphore is held
*/
- if (remap_p
age_range(vma, vma->vm_start, p_buf, size,
+ if (remap_p
fn_range(vma, vma->vm_start, p_buf >> PAGE_SHIFT, size,
vma->vm_page_prot))
goto out;
ret = 0;
vma->vm_page_prot))
goto out;
ret = 0;
@@
-120,12
+122,14
@@
static int __init mmapper_init(void)
printk(KERN_INFO "Mapper v0.1\n");
v_buf = (char *) find_iomem("mmapper", &mmapper_size);
printk(KERN_INFO "Mapper v0.1\n");
v_buf = (char *) find_iomem("mmapper", &mmapper_size);
- if(mmapper_size == 0) return(0);
+ if(mmapper_size == 0){
+ printk(KERN_ERR "mmapper_init - find_iomem failed\n");
+ return(0);
+ }
p_buf = __pa(v_buf);
devfs_mk_cdev(MKDEV(30, 0), S_IFCHR|S_IRUGO|S_IWUGO, "mmapper");
p_buf = __pa(v_buf);
devfs_mk_cdev(MKDEV(30, 0), S_IFCHR|S_IRUGO|S_IWUGO, "mmapper");
- devfs_mk_symlink("mmapper0", "mmapper");
return(0);
}
return(0);
}