summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2007-10-23 22:44:38 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-11-16 08:22:56 -0800
commitefd233a45eed8688d5d5b02f56610b0abf2474cc (patch)
treed66975dac5d67f6885a144338e2966bac05501ed
parent71ec6448bb2aa34353db19fec82d9969a3e4f672 (diff)
downloadlwn-efd233a45eed8688d5d5b02f56610b0abf2474cc.tar.gz
lwn-efd233a45eed8688d5d5b02f56610b0abf2474cc.zip
Fix sparc64 MAP_FIXED handling of framebuffer mmaps
patch d58aa8c7b1cc0add7b03e26bdb8988d98d2f4cd1 in mainline. From: Chris Wright <chrisw@sous-sol.org> Date: Tue, 23 Oct 2007 20:36:14 -0700 Subject: [PATCH] [SPARC64]: pass correct addr in get_fb_unmapped_area(MAP_FIXED) Looks like the MAP_FIXED case is using the wrong address hint. I'd expect the comment "don't mess with it" means pass the request straight on through, not change the address requested to -ENOMEM. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/sparc64/kernel/sys_sparc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index d108eeb0734f..6bf7bcdbaf3c 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -319,7 +319,7 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
if (flags & MAP_FIXED) {
/* 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;