diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /arch/m32r/mm/fault.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/m32r/mm/fault.c')
| -rw-r--r-- | arch/m32r/mm/fault.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index bf7fb58ef02c..dc18a33eefef 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * Copyright (C) 1995 Linus Torvalds | 8 | * Copyright (C) 1995 Linus Torvalds |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <linux/signal.h> | 11 | #include <linux/signal.h> |
| 13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| @@ -148,7 +147,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, | |||
| 148 | /* When running in the kernel we expect faults to occur only to | 147 | /* When running in the kernel we expect faults to occur only to |
| 149 | * addresses in user space. All other faults represent errors in the | 148 | * addresses in user space. All other faults represent errors in the |
| 150 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 149 | * kernel and should generate an OOPS. Unfortunatly, in the case of an |
| 151 | * erroneous fault occuring in a code path which already holds mmap_sem | 150 | * erroneous fault occurring in a code path which already holds mmap_sem |
| 152 | * we will deadlock attempting to validate the fault against the | 151 | * we will deadlock attempting to validate the fault against the |
| 153 | * address space. Luckily the kernel only validly references user | 152 | * address space. Luckily the kernel only validly references user |
| 154 | * space from well defined areas of code, which are listed in the | 153 | * space from well defined areas of code, which are listed in the |