diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-25 12:09:30 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-12-27 14:07:44 -0500 |
commit | 930c0f708e156613c37b97cf583c4c6b07d99cce (patch) | |
tree | 9e4e4ee548d5ac8256d112a09d604bb8eed16303 | |
parent | ec7b97208aaed46bd3fbe166d5909228c380a720 (diff) |
MIPS: Fix bitrot in __get_user_unaligned()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/include/asm/uaccess.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h index 2e3b3991cf0b..095ecafe6bd3 100644 --- a/arch/mips/include/asm/uaccess.h +++ b/arch/mips/include/asm/uaccess.h | |||
@@ -599,7 +599,7 @@ extern void __put_user_unknown(void); | |||
599 | * On error, the variable @x is set to zero. | 599 | * On error, the variable @x is set to zero. |
600 | */ | 600 | */ |
601 | #define __get_user_unaligned(x,ptr) \ | 601 | #define __get_user_unaligned(x,ptr) \ |
602 | __get_user__unalignednocheck((x),(ptr),sizeof(*(ptr))) | 602 | __get_user_unaligned_nocheck((x),(ptr),sizeof(*(ptr))) |
603 | 603 | ||
604 | /* | 604 | /* |
605 | * Yuck. We need two variants, one for 64bit operation and one | 605 | * Yuck. We need two variants, one for 64bit operation and one |
@@ -620,8 +620,8 @@ extern void __get_user_unaligned_unknown(void); | |||
620 | do { \ | 620 | do { \ |
621 | switch (size) { \ | 621 | switch (size) { \ |
622 | case 1: __get_data_asm(val, "lb", ptr); break; \ | 622 | case 1: __get_data_asm(val, "lb", ptr); break; \ |
623 | case 2: __get_user_unaligned_asm(val, "ulh", ptr); break; \ | 623 | case 2: __get_data_unaligned_asm(val, "ulh", ptr); break; \ |
624 | case 4: __get_user_unaligned_asm(val, "ulw", ptr); break; \ | 624 | case 4: __get_data_unaligned_asm(val, "ulw", ptr); break; \ |
625 | case 8: __GET_USER_UNALIGNED_DW(val, ptr); break; \ | 625 | case 8: __GET_USER_UNALIGNED_DW(val, ptr); break; \ |
626 | default: __get_user_unaligned_unknown(); break; \ | 626 | default: __get_user_unaligned_unknown(); break; \ |
627 | } \ | 627 | } \ |