diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-09 19:44:53 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-09 19:44:53 -0400 |
| commit | a84f5770170232a48e753e02ee5f0f17ee17b791 (patch) | |
| tree | 4efbd8a990df4437fb178c8a705dadc36812f98a /arch/um/kernel/trap_kern.c | |
| parent | 66302f211a21bb9439a2ae7f7b6a4c386bb10ecd (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
Merge with /home/aegl/GIT/linus
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 54e2ec33a43c..5fca2c61eb98 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, | |||
| 48 | goto good_area; | 48 | goto good_area; |
| 49 | else if(!(vma->vm_flags & VM_GROWSDOWN)) | 49 | else if(!(vma->vm_flags & VM_GROWSDOWN)) |
| 50 | goto out; | 50 | goto out; |
| 51 | else if(!ARCH_IS_STACKGROW(address)) | 51 | else if(is_user && !ARCH_IS_STACKGROW(address)) |
| 52 | goto out; | 52 | goto out; |
| 53 | else if(expand_stack(vma, address)) | 53 | else if(expand_stack(vma, address)) |
| 54 | goto out; | 54 | goto out; |