diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2004-02-10 15:58:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-02-10 15:58:16 -0800 |
| commit | 8fcb12575ca80babceb636047cd104e41bbb8b71 (patch) | |
| tree | 29cc16b2752b7a239932c401a4aeac467c7c6351 | |
| parent | a4614dba70168c5e87ac325fba9372a4bae34e4f (diff) | |
This reverts the mmap address hint usage for now.
It broke some existing setups, so let's drop it until we have
a better notion of how to do this.
| -rw-r--r-- | arch/x86_64/kernel/sys_x86_64.c | 4 | ||||
| -rw-r--r-- | mm/mmap.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/sys_x86_64.c b/arch/x86_64/kernel/sys_x86_64.c index 7c495f968655..366c886b9638 100644 --- a/arch/x86_64/kernel/sys_x86_64.c +++ b/arch/x86_64/kernel/sys_x86_64.c @@ -110,8 +110,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, if (end - len >= addr && (!vma || addr + len <= vma->vm_start)) return addr; - } else - addr = mm->free_area_cache; + } + addr = mm->free_area_cache; if (addr < begin) addr = begin; start_addr = addr; diff --git a/mm/mmap.c b/mm/mmap.c index d8dd7521e4d5..3aa905059030 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -743,9 +743,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, if (TASK_SIZE - len >= addr && (!vma || addr + len <= vma->vm_start)) return addr; - } else - addr = mm->free_area_cache; - start_addr = addr; + } + start_addr = addr = mm->free_area_cache; full_search: for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { |