diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-05-06 17:50:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:56 -0400 |
| commit | acec0ac0a87ca821f9d204780c2d1aa0509a6346 (patch) | |
| tree | 186b41271ef2b566d40c65bb3db517f33c7f11d5 /arch/arm/mm | |
| parent | 4b87b3b2eb1fa2d6ac0a1400ad5fb8f4b7cbfc09 (diff) | |
get_unmapped_area handles MAP_FIXED on arm
ARM already had a case for MAP_FIXED in arch_get_unmapped_area() though it was
not called before. Fix the comment to reflect that it will now be called.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/mmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index b0b5f4694070..2c4c2422cd1e 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c | |||
| @@ -49,8 +49,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, | |||
| 49 | #endif | 49 | #endif |
| 50 | 50 | ||
| 51 | /* | 51 | /* |
| 52 | * We should enforce the MAP_FIXED case. However, currently | 52 | * We enforce the MAP_FIXED case. |
| 53 | * the generic kernel code doesn't allow us to handle this. | ||
| 54 | */ | 53 | */ |
| 55 | if (flags & MAP_FIXED) { | 54 | if (flags & MAP_FIXED) { |
| 56 | if (aliasing && flags & MAP_SHARED && addr & (SHMLBA - 1)) | 55 | if (aliasing && flags & MAP_SHARED && addr & (SHMLBA - 1)) |