diff options
| author | Jeff Dike <jdike@addtoit.com> | 2005-05-06 21:30:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-06 22:09:31 -0700 |
| commit | 2d58cc9a437f3833d242e9d1617ec9b4044e26f3 (patch) | |
| tree | e5c5f2b57b178a66fe880c0f534cbc791cf09147 /arch/um/kernel/trap_kern.c | |
| parent | 0f7e663dea7f0e22f3b2d07156c5e9d2e8656610 (diff) | |
| download | op-kernel-dev-2d58cc9a437f3833d242e9d1617ec9b4044e26f3.zip op-kernel-dev-2d58cc9a437f3833d242e9d1617ec9b4044e26f3.tar.gz | |
[PATCH] uml: x86_64 fixes
This fixes some x86_64 bugs -
- maybe_map returns -1 on error instead of 0, which is interpreted as
physical address 0
- removed an include of ipc.h, which isn't needed
- fixed the calculation of signal frame location
- the signal delivery code is now immune to the stack expansion check
- added a missing include
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/trap_kern.c')
| -rw-r--r-- | arch/um/kernel/trap_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c index 54e2ec3..5fca2c6 100644 --- a/arch/um/kernel/trap_kern.c +++ b/arch/um/kernel/trap_kern.c @@ -48,7 +48,7 @@ int handle_page_fault(unsigned long address, unsigned long ip, goto good_area; else if(!(vma->vm_flags & VM_GROWSDOWN)) goto out; - else if(!ARCH_IS_STACKGROW(address)) + else if(is_user && !ARCH_IS_STACKGROW(address)) goto out; else if(expand_stack(vma, address)) goto out; |
