From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751642AbdF1EAi (ORCPT ); Wed, 28 Jun 2017 00:00:38 -0400 Received: from regular1.263xmail.com ([211.150.99.136]:39477 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750842AbdF1EAc (ORCPT ); Wed, 28 Jun 2017 00:00:32 -0400 X-263anti-spam: BIG:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ADDR-CHECKED4: 1 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ANTISPAM-LEVEL: 2 X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: sfr@canb.auug.org.au X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <595329D3.7080808@rock-chips.com> Date: Wed, 28 Jun 2017 12:00:19 +0800 From: jeffy User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:19.0) Gecko/20130126 Thunderbird/19.0 MIME-Version: 1.0 To: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Gustavo Padovan CC: Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: build failure after merge of the tip tree References: <20170628134310.3a605636@canb.auug.org.au> In-Reply-To: <20170628134310.3a605636@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On 06/28/2017 11:43 AM, Stephen Rothwell wrote: > Hi all, > > After merging the tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > net/bluetooth/hidp/core.c:1241:39: error: unknown type name 'wait_queue_t' > static int hidp_session_wake_function(wait_queue_t *wait, > ^ > In file included from include/linux/mmzone.h:9:0, > from include/linux/gfp.h:5, > from include/linux/kmod.h:22, > from include/linux/module.h:13, > from net/bluetooth/hidp/core.c:25: > net/bluetooth/hidp/core.c: In function 'hidp_session_thread': > net/bluetooth/hidp/core.c:1259:30: error: 'hidp_session_wake_function' undeclared (first use in this function) > DEFINE_WAIT_FUNC(ctrl_wait, hidp_session_wake_function); > ^ > include/linux/wait.h:954:12: note: in definition of macro 'DEFINE_WAIT_FUNC' > .func = function, \ > ^ > net/bluetooth/hidp/core.c:1259:30: note: each undeclared identifier is reported only once for each function it appears in > DEFINE_WAIT_FUNC(ctrl_wait, hidp_session_wake_function); > ^ > include/linux/wait.h:954:12: note: in definition of macro 'DEFINE_WAIT_FUNC' > .func = function, \ > ^ > > Caused by commit > > ac6424b981bc ("sched/wait: Rename wait_queue_t => wait_queue_entry_t") > > interacting with commit > > 5da8e47d849d ("Bluetooth: hidp: fix possible might sleep error in hidp_session_thread") > > from the bluetooth tree. I should have fixed this up in the merge, sorry. > I added the following merge fix for today. > > From: Stephen Rothwell > Date: Wed, 28 Jun 2017 13:36:04 +1000 > Subject: [PATCH] Bluetooth: hidp: fix for "sched/wait: Rename wait_queue_t => > wait_queue_entry_t" > > Signed-off-by: Stephen Rothwell > --- > net/bluetooth/hidp/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c > index 472b3907b1b0..002743ea509c 100644 > --- a/net/bluetooth/hidp/core.c > +++ b/net/bluetooth/hidp/core.c > @@ -1238,7 +1238,7 @@ static void hidp_session_run(struct hidp_session *session) > smp_mb__after_atomic(); > } > > -static int hidp_session_wake_function(wait_queue_t *wait, > +static int hidp_session_wake_function(wait_queue_entry_t *wait, thanx for fixing this. and i saw commit 50816c48997af857d4bab3dca1aba90339705e96 Author: Ingo Molnar Date: Sun Mar 5 10:33:16 2017 +0100 sched/wait: Standardize internal naming of wait-queue entries changed wait_queue_entry_t to struct wait_queue_entry, and also wait to wq_entry, maybe we should do it too? > unsigned int mode, > int sync, void *key) > { >