mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'DIV_ROUND_UP-uapi'

Browse source 
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>
This commit is contained in:
David S. Miller 2016-03-04 16:10:37 -05:00
commit 3d1c6df8cb
6 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h
View file

@ -25,6 +25,8 @@
* *
**************************************************************************/ **************************************************************************/
#include <linux/kernel.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <drm/vmwgfx_drm.h> #include <drm/vmwgfx_drm.h>
@ -36,7 +38,6 @@
#define ARRAY_SIZE(_A) (sizeof(_A) / sizeof((_A)[0])) #define ARRAY_SIZE(_A) (sizeof(_A) / sizeof((_A)[0]))
#endif /* ARRAY_SIZE */ #endif /* ARRAY_SIZE */
#define DIV_ROUND_UP(x, y) (((x) + (y) - 1) / (y))
#define max_t(type, x, y) ((x) > (y) ? (x) : (y)) #define max_t(type, x, y) ((x) > (y) ? (x) : (y))
#define surf_size_struct SVGA3dSize #define surf_size_struct SVGA3dSize
#define u32 uint32 #define u32 uint32
@ -987,12 +988,12 @@ svga3dsurface_get_size_in_blocks(const struct svga3d_surface_desc *desc,
const surf_size_struct *pixel_size, const surf_size_struct *pixel_size,
surf_size_struct *block_size) surf_size_struct *block_size)
{ {
block_size->width = DIV_ROUND_UP(pixel_size->width, block_size->width = __KERNEL_DIV_ROUND_UP(pixel_size->width,
desc->block_size.width); desc->block_size.width);
block_size->height = DIV_ROUND_UP(pixel_size->height, block_size->height = __KERNEL_DIV_ROUND_UP(pixel_size->height,
desc->block_size.height); desc->block_size.height);
block_size->depth = DIV_ROUND_UP(pixel_size->depth, block_size->depth = __KERNEL_DIV_ROUND_UP(pixel_size->depth,
desc->block_size.depth); desc->block_size.depth);
} }
static inline bool static inline bool
@ -1100,8 +1101,9 @@ svga3dsurface_get_pixel_offset(SVGA3dSurfaceFormat format,
const struct svga3d_surface_desc *desc = svga3dsurface_get_desc(format); const struct svga3d_surface_desc *desc = svga3dsurface_get_desc(format);
const u32 bw = desc->block_size.width, bh = desc->block_size.height; const u32 bw = desc->block_size.width, bh = desc->block_size.height;
const u32 bd = desc->block_size.depth; const u32 bd = desc->block_size.depth;
const u32 rowstride = DIV_ROUND_UP(width, bw) * desc->bytes_per_block; const u32 rowstride = __KERNEL_DIV_ROUND_UP(width, bw) *
const u32 imgstride = DIV_ROUND_UP(height, bh) * rowstride; desc->bytes_per_block;
const u32 imgstride = __KERNEL_DIV_ROUND_UP(height, bh) * rowstride;
const u32 offset = (z / bd * imgstride + const u32 offset = (z / bd * imgstride +
y / bh * rowstride + y / bh * rowstride +
x / bw * desc->bytes_per_block); x / bw * desc->bytes_per_block);

2
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
View file

@ -13,6 +13,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
@ -158,7 +159,6 @@ static struct scsi_transport_template *cxgb4i_stt;
* open/close/abort and data send/receive. * open/close/abort and data send/receive.
*/ */
#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#define RCV_BUFSIZ_MASK 0x3FFU #define RCV_BUFSIZ_MASK 0x3FFU
#define MAX_IMM_TX_PKT_LEN 256 #define MAX_IMM_TX_PKT_LEN 256

2
include/linux/kernel.h
View file

@ -64,7 +64,7 @@
#define round_down(x, y) ((x) & ~__round_mask(x, y)) #define round_down(x, y) ((x) & ~__round_mask(x, y))
#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) #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) \ #define DIV_ROUND_UP_ULL(ll,d) \
({ unsigned long long _tmp = (ll)+(d)-1; do_div(_tmp, d); _tmp; }) ({ unsigned long long _tmp = (ll)+(d)-1; do_div(_tmp, d); _tmp; })

7
include/uapi/linux/ethtool.h
View file

@ -13,9 +13,14 @@
#ifndef _UAPI_LINUX_ETHTOOL_H #ifndef _UAPI_LINUX_ETHTOOL_H
#define _UAPI_LINUX_ETHTOOL_H #define _UAPI_LINUX_ETHTOOL_H
#include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#ifndef __KERNEL__
#include <limits.h> /* for INT_MAX */
#endif
/* All structures exposed to userland should be defined such that they /* All structures exposed to userland should be defined such that they
* have the same layout for 32-bit and 64-bit userland. * have the same layout for 32-bit and 64-bit userland.
*/ */
@ -1215,7 +1220,7 @@ enum ethtool_sfeatures_retval_bits {
struct ethtool_per_queue_op { struct ethtool_per_queue_op {
__u32 cmd; __u32 cmd;
__u32 sub_command; __u32 sub_command;
__u32 queue_mask[DIV_ROUND_UP(MAX_NUM_QUEUE, 32)]; __u32 queue_mask[__KERNEL_DIV_ROUND_UP(MAX_NUM_QUEUE, 32)];
char data[]; char data[];
}; };

1
include/uapi/linux/kernel.h
View file

@ -9,5 +9,6 @@
#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) #define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))
#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#endif /* _UAPI_LINUX_KERNEL_H */ #endif /* _UAPI_LINUX_KERNEL_H */

9
include/uapi/linux/mroute6.h
View file

@ -1,6 +1,7 @@
#ifndef _UAPI__LINUX_MROUTE6_H #ifndef _UAPI__LINUX_MROUTE6_H
#define _UAPI__LINUX_MROUTE6_H #define _UAPI__LINUX_MROUTE6_H
#include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/sockios.h> #include <linux/sockios.h>
@ -46,14 +47,8 @@ typedef unsigned short mifi_t;
typedef __u32 if_mask; typedef __u32 if_mask;
#define NIFBITS (sizeof(if_mask) * 8) /* bits per mask */ #define NIFBITS (sizeof(if_mask) * 8) /* bits per mask */
#if !defined(__KERNEL__)
#if !defined(DIV_ROUND_UP)
#define DIV_ROUND_UP(x,y) (((x) + ((y) - 1)) / (y))
#endif
#endif
typedef struct if_set { typedef struct if_set {
if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)]; if_mask ifs_bits[__KERNEL_DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
} if_set; } if_set;
#define IF_SET(n, p) ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS))) #define IF_SET(n, p) ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))