Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52a21f2c authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Martin Schwidefsky
Browse files

[S390] fix build breakage with CONFIG_AIO=n 



next-20090925 randconfig build breaks on s390x, with CONFIG_AIO=n.

arch/s390/mm/pgtable.c: In function 's390_enable_sie':
arch/s390/mm/pgtable.c:282: error: 'struct mm_struct' has no member named 'ioctx_list'
arch/s390/mm/pgtable.c:298: error: 'struct mm_struct' has no member named 'ioctx_list'
make[1]: *** [arch/s390/mm/pgtable.o] Error 1

Reported-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0eca52a9

arch/s390/mm/pgtable.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -279,7 +279,10 @@ int s390_enable_sie(void) 
	/* lets check if we are allowed to replace the mm */

	/* lets check if we are allowed to replace the mm */

	task_lock(tsk);

	task_lock(tsk);

	if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||

	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);

		task_unlock(tsk);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -295,7 +298,10 @@ int s390_enable_sie(void) 
	/* Now lets check again if something happened */

	/* Now lets check again if something happened */

	task_lock(tsk);

	task_lock(tsk);

	if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||

	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);

		mmput(mm);

		task_unlock(tsk);

		task_unlock(tsk);

		return -EINVAL;

		return -EINVAL;