diff options
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 2fe6e84894a..eff75504cf1 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -4,8 +4,8 @@ /* * 'kernel.h' contains some often-used function prototypes etc */ -#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) -#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) + +#include <linux/align.h> #ifdef __KERNEL__ @@ -37,11 +37,6 @@ #define STACK_MAGIC 0xdeadbeef -#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) -#define __ALIGN_MASK(x, mask) __ALIGN_KERNEL_MASK((x), (mask)) -#define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) -#define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) - #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) /* |