Pull percpu-dtc into release branch

[linux-2.6] / drivers / char / mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index f5c160caf9f480978db2cb0698192268433370ae..5f066963f171b5c9ff3a321b77e32798ee14be39 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -248,7 +248,7 @@ static unsigned long get_unmapped_area_mem(struct file *file,
 {
        if (!valid_mmap_phys_addr_range(pgoff, len))
                return (unsigned long) -EINVAL;
-       return pgoff;
+       return pgoff << PAGE_SHIFT;
 }
 
 /* can't do an in-place private mapping if there's no MMU */