tools: move alignment-related macros to new <linux/align.h>
commit 10a04ff09bcc39e0044190ffe9f00f998f13647c upstream. Currently, tools have *ALIGN*() macros scattered across the unrelated headers, as there are only 3 of them and they were added separately each time on an as-needed basis. Anyway, let's make it more consistent with the kernel headers and allow using those macros outside of the mentioned headers. Create <linux/align.h> inside the tools/ folder and include it where needed. Signed-off-by: Yury Norov <yury.norov@gmail.com> Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
95f73d01f5
Коммит
ce0aa899c9
|
@ -0,0 +1,12 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||||
|
|
||||||
|
#ifndef _TOOLS_LINUX_ALIGN_H
|
||||||
|
#define _TOOLS_LINUX_ALIGN_H
|
||||||
|
|
||||||
|
#include <uapi/linux/const.h>
|
||||||
|
|
||||||
|
#define ALIGN(x, a) __ALIGN_KERNEL((x), (a))
|
||||||
|
#define ALIGN_DOWN(x, a) __ALIGN_KERNEL((x) - ((a) - 1), (a))
|
||||||
|
#define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0)
|
||||||
|
|
||||||
|
#endif /* _TOOLS_LINUX_ALIGN_H */
|
|
@ -3,6 +3,7 @@
|
||||||
#define _PERF_BITOPS_H
|
#define _PERF_BITOPS_H
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <linux/align.h>
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
@ -160,7 +161,6 @@ static inline int bitmap_and(unsigned long *dst, const unsigned long *src1,
|
||||||
#define BITMAP_MEM_ALIGNMENT (8 * sizeof(unsigned long))
|
#define BITMAP_MEM_ALIGNMENT (8 * sizeof(unsigned long))
|
||||||
#endif
|
#endif
|
||||||
#define BITMAP_MEM_MASK (BITMAP_MEM_ALIGNMENT - 1)
|
#define BITMAP_MEM_MASK (BITMAP_MEM_ALIGNMENT - 1)
|
||||||
#define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0)
|
|
||||||
|
|
||||||
static inline int bitmap_equal(const unsigned long *src1,
|
static inline int bitmap_equal(const unsigned long *src1,
|
||||||
const unsigned long *src2, unsigned int nbits)
|
const unsigned long *src2, unsigned int nbits)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче