From: David Miller <da...@davemloft.net>
Date: Thu, 03 Mar 2016 16:43:52 -0500 (EST)
> From: Nicolas Dichtel <nicolas.dich...@6wind.com>
> 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 <kan.li...@intel.com>
>> Suggested-by: Ben Hutchings <b...@decadent.org.uk>
>> Signed-off-by: Nicolas Dichtel <nicolas.dich...@6wind.com>
>
> 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
