diff --git a/[refs] b/[refs] index 17fae7b3b03c..b7ebf08580ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e7f4d451e99b7592a96ad0efaf8bcc1e7b2f854 +refs/heads/master: 36596243daf7e1d795c647de04af95e835b8c5b4 diff --git a/trunk/kernel/mutex-debug.h b/trunk/kernel/mutex-debug.h index 8417b52ebd65..bdab13a9ee26 100644 --- a/trunk/kernel/mutex-debug.h +++ b/trunk/kernel/mutex-debug.h @@ -103,17 +103,9 @@ do { \ } \ } while (0) -# define DEBUG_BUG_ON(c) \ -do { \ - if (unlikely(c)) \ - DEBUG_BUG(); \ -} while (0) - #ifdef CONFIG_SMP # define SMP_DEBUG_LOCKS_WARN_ON(c) DEBUG_LOCKS_WARN_ON(c) -# define SMP_DEBUG_BUG_ON(c) DEBUG_BUG_ON(c) #else # define SMP_DEBUG_LOCKS_WARN_ON(c) do { } while (0) -# define SMP_DEBUG_BUG_ON(c) do { } while (0) #endif