diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 18:50:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 18:50:48 -0400 |
| commit | eadd4f5ea1507403655e9f5aeb0ea944eaa9d5de (patch) | |
| tree | b2f4e0c39239ad24524139e8cf008fef24fa306f /arch | |
| parent | 06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c (diff) | |
| parent | d58aa8c7b1cc0add7b03e26bdb8988d98d2f4cd1 (diff) | |
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)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/kernel/sys_sparc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index 560cb1edb1d0..c56573a10eee 100644 --- a/arch/sparc64/kernel/sys_sparc.c +++ b/arch/sparc64/kernel/sys_sparc.c | |||
| @@ -318,7 +318,7 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u | |||
| 318 | 318 | ||
| 319 | if (flags & MAP_FIXED) { | 319 | if (flags & MAP_FIXED) { |
| 320 | /* Ok, don't mess with it. */ | 320 | /* Ok, don't mess with it. */ |
| 321 | return get_unmapped_area(NULL, addr, len, pgoff, flags); | 321 | return get_unmapped_area(NULL, orig_addr, len, pgoff, flags); |
| 322 | } | 322 | } |
| 323 | flags &= ~MAP_SHARED; | 323 | flags &= ~MAP_SHARED; |
| 324 | 324 | ||