UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Alexander Lobakin 2024-03-27 16:23:48 +01:00 committed by Greg Kroah-Hartman
parent 8f04edd554
commit a2081b8cab
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/include/linux/align.h Normal file
View File

@ -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 */

2
tools/include/linux/bitmap.h
View File

@ -3,6 +3,7 @@
#define _TOOLS_LINUX_BITMAP_H #define _TOOLS_LINUX_BITMAP_H
#include <string.h> #include <string.h>
#include <linux/align.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/find.h> #include <linux/find.h>
#include <stdlib.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)) #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 bool bitmap_equal(const unsigned long *src1, static inline bool bitmap_equal(const unsigned long *src1,
const unsigned long *src2, unsigned int nbits) const unsigned long *src2, unsigned int nbits)

5
tools/include/linux/mm.h
View File

@ -2,8 +2,8 @@
#ifndef _TOOLS_LINUX_MM_H #ifndef _TOOLS_LINUX_MM_H
#define _TOOLS_LINUX_MM_H #define _TOOLS_LINUX_MM_H
#include <linux/align.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <uapi/linux/const.h>
#define PAGE_SHIFT 12 #define PAGE_SHIFT 12
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
@ -11,9 +11,6 @@
#define PHYS_ADDR_MAX (~(phys_addr_t)0) #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 PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
#define __va(x) ((void *)((unsigned long)(x))) #define __va(x) ((void *)((unsigned long)(x)))