diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
commit | 32ea89ecb25789b1b7db28146558587a42f3b372 (patch) | |
tree | c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 /arch/powerpc/mm/fault.c | |
parent | 58a7ce64426394a46e80cdc9440cc1e7c195e85d (diff) | |
parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/mm/fault.c')
-rw-r--r-- | arch/powerpc/mm/fault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 5aea0909a5ec..fdbba4206d59 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
@@ -177,15 +177,15 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, | |||
177 | 177 | ||
178 | /* When running in the kernel we expect faults to occur only to | 178 | /* When running in the kernel we expect faults to occur only to |
179 | * addresses in user space. All other faults represent errors in the | 179 | * addresses in user space. All other faults represent errors in the |
180 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 180 | * kernel and should generate an OOPS. Unfortunately, in the case of an |
181 | * erroneous fault occuring in a code path which already holds mmap_sem | 181 | * erroneous fault occurring in a code path which already holds mmap_sem |
182 | * we will deadlock attempting to validate the fault against the | 182 | * we will deadlock attempting to validate the fault against the |
183 | * address space. Luckily the kernel only validly references user | 183 | * address space. Luckily the kernel only validly references user |
184 | * space from well defined areas of code, which are listed in the | 184 | * space from well defined areas of code, which are listed in the |
185 | * exceptions table. | 185 | * exceptions table. |
186 | * | 186 | * |
187 | * As the vast majority of faults will be valid we will only perform | 187 | * As the vast majority of faults will be valid we will only perform |
188 | * the source reference check when there is a possibilty of a deadlock. | 188 | * the source reference check when there is a possibility of a deadlock. |
189 | * Attempt to lock the address space, if we cannot we then validate the | 189 | * Attempt to lock the address space, if we cannot we then validate the |
190 | * source. If this is invalid we can skip the address space check, | 190 | * source. If this is invalid we can skip the address space check, |
191 | * thus avoiding the deadlock. | 191 | * thus avoiding the deadlock. |