diff --git a/[refs] b/[refs] index b1dace3045e2..e7c50d3b0a05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 165d6c78ee24127dde5c750b2af0a239f9c11d1a +refs/heads/master: 2aa92581fb13e04e1440e5041b412cc06c782e0e diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index b12a4706f73f..601263c0806f 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -898,7 +898,7 @@ fastcall NORET_TYPE void do_exit(long code) } if (unlikely(tsk->robust_list)) exit_robust_list(tsk); -#ifdef CONFIG_COMPAT +#if defined(CONFIG_FUTEX) && defined(CONFIG_COMPAT) if (unlikely(tsk->compat_robust_list)) compat_exit_robust_list(tsk); #endif