From 6ef4be047ad36ca49ceed6991c8ad73655ef0d11 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 30 Mar 2002 20:44:31 +0000 Subject: [PATCH] Use the MI vm_map_growstack() instead of the MD grow_stack() in trap(). Remove the MD grow_stack(). --- sys/powerpc/aim/trap.c | 6 +++--- sys/powerpc/aim/vm_machdep.c | 14 -------------- sys/powerpc/powerpc/trap.c | 6 +++--- sys/powerpc/powerpc/vm_machdep.c | 14 -------------- 4 files changed, 6 insertions(+), 34 deletions(-) diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c index 2b2d746435c..1de9b0595d5 100644 --- a/sys/powerpc/aim/trap.c +++ b/sys/powerpc/aim/trap.c @@ -492,13 +492,13 @@ trap_pfault(struct trapframe *frame, int user) /* * Grow the stack if necessary */ - /* grow_stack returns false only if va falls into + /* vm_map_growstack returns failure only if va falls into * a growable stack region and the stack growth - * fails. It returns true if va was not within + * fails. It succeeds if va was not within * a growable stack region, or if the stack * growth succeeded. */ - if (!grow_stack (p, va)) + if (vm_map_growstack(p, va) != KERN_SUCCESS) rv = KERN_FAILURE; else /* Fault in the user page: */ diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c index 6a152c9fe52..1ca7350649f 100644 --- a/sys/powerpc/aim/vm_machdep.c +++ b/sys/powerpc/aim/vm_machdep.c @@ -310,20 +310,6 @@ cpu_reset() OF_exit(); } -int -grow_stack(p, sp) - struct proc *p; - size_t sp; -{ - int rv; - - rv = vm_map_growstack (p, sp); - if (rv != KERN_SUCCESS) - return (0); - - return (1); -} - /* * Software interrupt handler for queued VM system processing. */ diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c index 2b2d746435c..1de9b0595d5 100644 --- a/sys/powerpc/powerpc/trap.c +++ b/sys/powerpc/powerpc/trap.c @@ -492,13 +492,13 @@ trap_pfault(struct trapframe *frame, int user) /* * Grow the stack if necessary */ - /* grow_stack returns false only if va falls into + /* vm_map_growstack returns failure only if va falls into * a growable stack region and the stack growth - * fails. It returns true if va was not within + * fails. It succeeds if va was not within * a growable stack region, or if the stack * growth succeeded. */ - if (!grow_stack (p, va)) + if (vm_map_growstack(p, va) != KERN_SUCCESS) rv = KERN_FAILURE; else /* Fault in the user page: */ diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index 6a152c9fe52..1ca7350649f 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -310,20 +310,6 @@ cpu_reset() OF_exit(); } -int -grow_stack(p, sp) - struct proc *p; - size_t sp; -{ - int rv; - - rv = vm_map_growstack (p, sp); - if (rv != KERN_SUCCESS) - return (0); - - return (1); -} - /* * Software interrupt handler for queued VM system processing. */