diff --git a/[refs] b/[refs] index 2164a5ba4538..41d6a115a779 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0216bfcffe424a5473daa4da47440881b36c1f41 +refs/heads/master: 368a5fa1f28589e6b54588a139ea872d5b4b1914 diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index 25fccd859fbf..8c21aaa248b4 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -78,7 +78,7 @@ extern int cond_resched(void); # define might_sleep() do { might_resched(); } while (0) #endif -#define might_sleep_if(cond) do { if (unlikely(cond)) might_sleep(); } while (0) +#define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0) #define abs(x) ({ \ int __x = (x); \