Commit a0325994 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Long Li
Browse files

tools: move alignment-related macros to new <linux/align.h> 

stable inclusion
from stable-v5.10.224
commit 239b1cacceece336072a944b24ac1fcaac42de1d
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAQOJ9
CVE: CVE-2024-45025

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=tags/v5.10.225&id=239b1cacceece336072a944b24ac1fcaac42de1d



--------------------------------

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: default avatarYury Norov <yury.norov@gmail.com>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent e9d48c1c

tools/include/linux/align.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* 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 */

tools/include/linux/bitmap.h

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define _PERF_BITOPS_H



#include <string.h>

#include <linux/align.h>

#include <linux/bitops.h>

#include <stdlib.h>

#include <linux/kernel.h>
@@ -165,7 +166,6 @@ static inline int bitmap_and(unsigned long *dst, const unsigned long *src1, 
#define BITMAP_MEM_ALIGNMENT (8 * sizeof(unsigned long))

#endif

#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,

			const unsigned long *src2, unsigned int nbits)