[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAH2r5mtkByKNPYN50ioRoS79sAR_rhShANcm9o-Qvo7S762VFg@mail.gmail.com>
Date: Tue, 25 Oct 2011 10:05:52 -0500
From: Steve French <smfrench@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-cifs@...r.kernel.org, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, Jeff Layton <jlayton@...hat.com>,
Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: build failure after merge of the cifs tree
Corrected typo in proposed patch and merged to cifs-2.6.git
On Tue, Oct 25, 2011 at 9:51 AM, Steve French <smfrench@...il.com> wrote:
> Am fixing it now. Jeff missed a stub for the non-freezer case.
>
> diff --git a/include/linux/freezer.h b/include/linux/freezer.h
> index a155561..cd2d55b 100644
> --- a/include/linux/freezer.h
> +++ b/include/linux/freezer.h
> @@ -202,6 +202,8 @@ static inline void set_freezable_with_signal(void) {}
>
> #define wait_event_freezable_timeout(wq, condition, timeout) \
> wait_event_interruptible_timeout(wq, condition, timeout)
> +#define #define wait_event_freezekillable(wq, condition) \
> + wait_event_killable(wq, condition)
>
>
> On Tue, Oct 25, 2011 at 8:59 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>> Hi all,
>>
>> After merging the cifs tree, today's linux-next build (powerpc
>> iseries_defconfig) failed like this:
>>
>> fs/cifs/transport.c: In function 'wait_for_response':
>> fs/cifs/transport.c:328: error: implicit declaration of function 'wait_event_freezekillable'
>>
>> Caused by commit f06ac72e9291 ("cifs, freezer: add
>> wait_event_freezekillable and have cifs use it"). In this config,
>> CONFIG_FREEZER is not set.
>> --
>> Cheers,
>> Stephen Rothwell sfr@...b.auug.org.au
>> http://www.canb.auug.org.au/~sfr/
>>
>
>
>
> --
> Thanks,
>
> Steve
>
--
Thanks,
Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists