diff --git a/[refs] b/[refs] index 4af31822dcd2..76b18a4fc8c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 340ee4b98c0543b5632cac975a7449a2d28762d8 +refs/heads/master: 27c7c1657df54352838d176b39e119b799bf7855 diff --git a/trunk/include/asm-mips/uaccess.h b/trunk/include/asm-mips/uaccess.h index b41901db69b8..41bb96bb2120 100644 --- a/trunk/include/asm-mips/uaccess.h +++ b/trunk/include/asm-mips/uaccess.h @@ -213,7 +213,6 @@ struct __large_struct { unsigned long buf[100]; }; __typeof(*(ptr)) __gu_val = (__typeof(*(ptr))) 0; \ long __gu_err = 0; \ \ - might_sleep(); \ switch (size) { \ case 1: __get_user_asm("lb", ptr); break; \ case 2: __get_user_asm("lh", ptr); break; \ @@ -300,7 +299,6 @@ extern void __get_user_unknown(void); __typeof__(*(ptr)) __pu_val; \ long __pu_err = 0; \ \ - might_sleep(); \ __pu_val = (x); \ switch (size) { \ case 1: __put_user_asm("sb", ptr); break; \