From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Schwidefsky Subject: Re: linux-next: 20090925 - build breaks with !CONFIG_AIO Date: Sat, 26 Sep 2009 13:37:02 +0200 Message-ID: <20090926133702.44f315f7@mschwide.boeblingen.de.ibm.com> References: <20090925133830.1ba29584.sfr@canb.auug.org.au> <20090925131958.GC6831@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from mtagate3.de.ibm.com ([195.212.17.163]:36663 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751013AbZIZLhG (ORCPT ); Sat, 26 Sep 2009 07:37:06 -0400 In-Reply-To: <20090925131958.GC6831@linux.vnet.ibm.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Kamalesh Babulal Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , heiko.carstens@de.ibm.com, linux-s390@vger.kernel.org, adobriyan@gmail.com On Fri, 25 Sep 2009 18:49:58 +0530 Kamalesh Babulal wrote: > Hi Stephen, > > 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 > > Reverting the below commit helps > > commit 858f09930b32c11b40fd0c5c467982ba09b10894 > Author: Alexey Dobriyan > Date: Wed Sep 23 15:57:32 2009 -0700 > > aio: ifdef fields in mm_struct > > ->ioctx_lock and ->ioctx_list are used only under CONFIG_AIO. That should be fixed in the s390 pgtable.c code: -- Subject: [PATCH] fix build breakage with CONFIG_AIO=n From: Martin Schwidefsky 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: Kamalesh Babulal Signed-off-by: Martin Schwidefsky --- arch/s390/mm/pgtable.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff -urpN linux-2.6/arch/s390/mm/pgtable.c linux-2.6-patched/arch/s390/mm/pgtable.c --- linux-2.6/arch/s390/mm/pgtable.c 2009-09-26 13:35:36.000000000 +0200 +++ linux-2.6-patched/arch/s390/mm/pgtable.c 2009-09-26 13:35:47.000000000 +0200 @@ -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; -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.