diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-16 02:46:15 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-16 02:46:15 -0400 |
| commit | c5f977a0d2d6a8f02f32139b5dd129e52073f38f (patch) | |
| tree | 82180b8f21992312ad78becf759f21b9110e72ca /arch/mips/kernel/sysirix.c | |
| parent | f3d242e8f2bf12cb45eb35b7d2e69483d1209b13 (diff) | |
| parent | 065d9cac98a5406ecd5a1368f8fd38f55739dee9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/mips/kernel/sysirix.c')
| -rw-r--r-- | arch/mips/kernel/sysirix.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index 4de155699c4..7ae4af47697 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c @@ -581,18 +581,13 @@ asmlinkage int irix_brk(unsigned long brk) } /* - * Check if we have enough memory.. + * Ok, looks good - let it rip. */ - if (security_vm_enough_memory((newbrk-oldbrk) >> PAGE_SHIFT)) { + if (do_brk(oldbrk, newbrk-oldbrk) != oldbrk) { ret = -ENOMEM; goto out; } - - /* - * Ok, looks good - let it rip. - */ mm->brk = brk; - do_brk(oldbrk, newbrk-oldbrk); ret = 0; out: |