Commit eadd4f5e authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: pass correct addr in get_fb_unmapped_area(MAP_FIXED)
parents 06dbbfef d58aa8c7
...@@ -318,7 +318,7 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u ...@@ -318,7 +318,7 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
if (flags & MAP_FIXED) { if (flags & MAP_FIXED) {
/* Ok, don't mess with it. */ /* Ok, don't mess with it. */
return get_unmapped_area(NULL, addr, len, pgoff, flags); return get_unmapped_area(NULL, orig_addr, len, pgoff, flags);
} }
flags &= ~MAP_SHARED; flags &= ~MAP_SHARED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment