aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/mm/fault.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 12:12:14 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 12:12:14 -0400
commitfac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch)
tree1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /arch/m32r/mm/fault.c
parent6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff)
parenta6360dd37e1a144ed11e6548371bade559a1e4df (diff)
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'arch/m32r/mm/fault.c')
-rw-r--r--arch/m32r/mm/fault.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
index b8ec002aef8e..2c9aeb453847 100644
--- a/arch/m32r/mm/fault.c
+++ b/arch/m32r/mm/fault.c
@@ -120,7 +120,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
120 120
121 /* When running in the kernel we expect faults to occur only to 121 /* When running in the kernel we expect faults to occur only to
122 * addresses in user space. All other faults represent errors in the 122 * addresses in user space. All other faults represent errors in the
123 * kernel and should generate an OOPS. Unfortunatly, in the case of an 123 * kernel and should generate an OOPS. Unfortunately, in the case of an
124 * erroneous fault occurring in a code path which already holds mmap_sem 124 * erroneous fault occurring in a code path which already holds mmap_sem
125 * we will deadlock attempting to validate the fault against the 125 * we will deadlock attempting to validate the fault against the
126 * address space. Luckily the kernel only validly references user 126 * address space. Luckily the kernel only validly references user
@@ -128,7 +128,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
128 * exceptions table. 128 * exceptions table.
129 * 129 *
130 * As the vast majority of faults will be valid we will only perform 130 * As the vast majority of faults will be valid we will only perform
131 * the source reference check when there is a possibilty of a deadlock. 131 * the source reference check when there is a possibility of a deadlock.
132 * Attempt to lock the address space, if we cannot we then validate the 132 * Attempt to lock the address space, if we cannot we then validate the
133 * source. If this is invalid we can skip the address space check, 133 * source. If this is invalid we can skip the address space check,
134 * thus avoiding the deadlock. 134 * thus avoiding the deadlock.