Commit 23142987 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Peng Zhang
Browse files

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

stable inclusion
from stable-v6.6.48
commit a2081b8cabbead2393f3c27232f87ebc14bd70ff
bugzilla: https://gitee.com/openeuler/kernel/issues/IAP55A

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a2081b8cabbead2393f3c27232f87ebc14bd70ff



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

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 avatarZhangPeng <zhangpeng362@huawei.com>
parent 61e64f18

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 _TOOLS_LINUX_BITMAP_H



#include <string.h>

#include <linux/align.h>

#include <linux/bitops.h>

#include <linux/find.h>

#include <stdlib.h>
@@ -127,7 +128,6 @@ static inline bool 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 bool bitmap_equal(const unsigned long *src1,

				const unsigned long *src2, unsigned int nbits)

tools/include/linux/mm.h

+1 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#ifndef _TOOLS_LINUX_MM_H

#define _TOOLS_LINUX_MM_H



#include <linux/align.h>

#include <linux/mmzone.h>

#include <uapi/linux/const.h>



#define PAGE_SHIFT		12

#define PAGE_SIZE		(_AC(1, UL) << PAGE_SHIFT)
@@ -11,9 +11,6 @@ 


#define PHYS_ADDR_MAX	(~(phys_addr_t)0)



#define ALIGN(x, a)			__ALIGN_KERNEL((x), (a))

#define ALIGN_DOWN(x, a)		__ALIGN_KERNEL((x) - ((a) - 1), (a))



#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)



#define __va(x) ((void *)((unsigned long)(x)))