diff options
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/sys_sparc.c | 6 | ||||
-rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index ac1bff58c1ac..e1f4eba2e576 100644 --- a/arch/sparc64/kernel/sys_sparc.c +++ b/arch/sparc64/kernel/sys_sparc.c | |||
@@ -542,7 +542,7 @@ asmlinkage long sparc64_personality(unsigned long personality) | |||
542 | return ret; | 542 | return ret; |
543 | } | 543 | } |
544 | 544 | ||
545 | int sparc64_mmap_check(unsigned long addr, unsigned long len) | 545 | int sparc_mmap_check(unsigned long addr, unsigned long len) |
546 | { | 546 | { |
547 | if (test_thread_flag(TIF_32BIT)) { | 547 | if (test_thread_flag(TIF_32BIT)) { |
548 | if (len >= STACK_TOP32) | 548 | if (len >= STACK_TOP32) |
@@ -614,9 +614,9 @@ asmlinkage unsigned long sys64_mremap(unsigned long addr, | |||
614 | goto out; | 614 | goto out; |
615 | if (unlikely(new_len >= VA_EXCLUDE_START)) | 615 | if (unlikely(new_len >= VA_EXCLUDE_START)) |
616 | goto out; | 616 | goto out; |
617 | if (unlikely(sparc64_mmap_check(addr, old_len))) | 617 | if (unlikely(sparc_mmap_check(addr, old_len))) |
618 | goto out; | 618 | goto out; |
619 | if (unlikely(sparc64_mmap_check(new_addr, new_len))) | 619 | if (unlikely(sparc_mmap_check(new_addr, new_len))) |
620 | goto out; | 620 | goto out; |
621 | 621 | ||
622 | down_write(¤t->mm->mmap_sem); | 622 | down_write(¤t->mm->mmap_sem); |
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index 590679795ce2..97b77fb5c50e 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c | |||
@@ -871,9 +871,9 @@ asmlinkage unsigned long sys32_mremap(unsigned long addr, | |||
871 | unsigned long ret = -EINVAL; | 871 | unsigned long ret = -EINVAL; |
872 | unsigned long new_addr = __new_addr; | 872 | unsigned long new_addr = __new_addr; |
873 | 873 | ||
874 | if (unlikely(sparc64_mmap_check(addr, old_len))) | 874 | if (unlikely(sparc_mmap_check(addr, old_len))) |
875 | goto out; | 875 | goto out; |
876 | if (unlikely(sparc64_mmap_check(new_addr, new_len))) | 876 | if (unlikely(sparc_mmap_check(new_addr, new_len))) |
877 | goto out; | 877 | goto out; |
878 | down_write(¤t->mm->mmap_sem); | 878 | down_write(¤t->mm->mmap_sem); |
879 | ret = do_mremap(addr, old_len, new_len, flags, new_addr); | 879 | ret = do_mremap(addr, old_len, new_len, flags, new_addr); |