Skip to content

Commit c2d8925

Browse files
torvaldsgregkh
authored andcommitted
csky: fix up lock_mm_and_find_vma() conversion
commit e55e5df upstream. As already mentioned in my merge message for the 'expand-stack' branch, we have something like 24 different versions of the page fault path for all our different architectures, all just _slightly_ different due to various historical reasons (usually related to exactly when they branched off the original i386 version, and the details of the other architectures they had in their history). And a few of them had some silly mistake in the conversion. Most of the architectures call the faulting address 'address' in the fault path. But not all. Some just call it 'addr'. And if you end up doing a bit too much copy-and-paste, you end up with the wrong version in the places that do it differently. In this case it was csky. Fixes: a050ba1 ("mm/fault: convert remaining simple cases to lock_mm_and_find_vma()") Reported-by: Guenter Roeck <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 4a1db15 commit c2d8925

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/csky/mm/fault.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
237237
if (is_write(regs))
238238
flags |= FAULT_FLAG_WRITE;
239239
retry:
240-
vma = lock_mm_and_find_vma(mm, address, regs);
240+
vma = lock_mm_and_find_vma(mm, addr, regs);
241241
if (unlikely(!vma)) {
242242
bad_area_nosemaphore(regs, mm, code, addr);
243243
return;

0 commit comments

Comments
 (0)