1 files changed, 8 insertions, 2 deletions

diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index c60bfb309ce6..2757c5616a07 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -279,7 +279,10 @@ int s390_enable_sie(void)
         /* lets check if we are allowed to replace the mm */
         task_lock(tsk);
         if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
-            tsk->mm != tsk->active_mm || !hlist_empty(&tsk->mm->ioctx_list)) {
+#ifdef CONFIG_AIO
+            !hlist_empty(&tsk->mm->ioctx_list) ||
+#endif
+            tsk->mm != tsk->active_mm) {
                 task_unlock(tsk);
                 return -EINVAL;
         }
@@ -295,7 +298,10 @@ int s390_enable_sie(void)
         /* Now lets check again if something happened */
         task_lock(tsk);
         if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
-            tsk->mm != tsk->active_mm || !hlist_empty(&tsk->mm->ioctx_list)) {
+#ifdef CONFIG_AIO
+            !hlist_empty(&tsk->mm->ioctx_list) ||
+#endif
+            tsk->mm != tsk->active_mm) {
                 mmput(mm);
                 task_unlock(tsk);
                 return -EINVAL;