From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH net-next v2 1/2] uapi: define DIV_ROUND_UP for userland Date: Thu, 03 Mar 2016 17:08:04 -0500 (EST) Message-ID: <20160303.170804.2300821465150459193.davem@davemloft.net> References: <1456846141.3098.155.camel@decadent.org.uk> <1456850464-23003-1-git-send-email-nicolas.dichtel@6wind.com> <20160303.164352.1296057971694454944.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, ben@decadent.org.uk, kan.liang@intel.com To: nicolas.dichtel@6wind.com Return-path: Received: from shards.monkeyblade.net ([149.20.54.216]:48160 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751334AbcCCWIG (ORCPT ); Thu, 3 Mar 2016 17:08:06 -0500 In-Reply-To: <20160303.164352.1296057971694454944.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-ID: From: David Miller Date: Thu, 03 Mar 2016 16:43:52 -0500 (EST) > From: Nicolas Dichtel > Date: Tue, 1 Mar 2016 17:41:03 +0100 > >> DIV_ROUND_UP is defined in linux/kernel.h only for the kernel. >> When ethtool.h is included by a userland app, we got the following error: >> >> include/linux/ethtool.h:1218:8: error: variably modified 'queue_mask' at file scope >> __u32 queue_mask[DIV_ROUND_UP(MAX_NUM_QUEUE, 32)]; >> ^ >> >> Let's add a common definition in uapi and use it everywhere. >> >> Fixes: ac2c7ad0e5d6 ("net/ethtool: introduce a new ioctl for per queue setting") >> CC: Kan Liang >> Suggested-by: Ben Hutchings >> Signed-off-by: Nicolas Dichtel > > Applied. Unfortunately I have to revert these two commits. It breaks the build, and although it isn't your fault you have to resolve this before I can apply these two changes: drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:161:0: warning: "DIV_ROUND_UP" redefined #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) ^ In file included from include/linux/list.h:8:0, from include/linux/module.h:9, from drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:16: include/linux/kernel.h:67:0: note: this is the location of the previous definition #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP ^ C-c C-cscripts/Makefile.build:258: recipe for target 'drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.o' failed