diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-03-04 16:10:37 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-04 16:10:37 -0500 |
| commit | 3d1c6df8cb06b999fdf72c17966c30d7a21484d0 (patch) | |
| tree | 371ad0004ce8f8f0158b9c5e066d5765faec9011 /include/linux/kernel.h | |
| parent | nfp: remove Rolf Neugebauer as co-maintainer (diff) | |
| parent | ethtool.h: define INT_MAX for userland (diff) | |
Merge branch 'DIV_ROUND_UP-uapi'
Nicolas Dichtel says:
====================
uapi: consolidate DIV_ROUND_UP definition
The inital goal was to consolidate ethtool.h uapi header. But I took the
opportunity to remove all duplicate definitions of DIV_ROUND_UP.
v3: add patch #2 and #3
v2: split the patch
define DIV_ROUND_UP in uapi
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index f31638c6e873..ac1923957236 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -64,7 +64,7 @@ #define round_down(x, y) ((x) & ~__round_mask(x, y)) #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) -#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) +#define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP #define DIV_ROUND_UP_ULL(ll,d) \ ({ unsigned long long _tmp = (ll)+(d)-1; do_div(_tmp, d); _tmp; }) |