diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-04-13 08:09:15 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-04-13 08:09:15 -0400 |
commit | 9f93ff5be54108066372d1c4100c515d9d9acc1b (patch) | |
tree | fb14dba8595537a78c199b1f47671a77fe2d42e0 /include/linux/kernel.h | |
parent | e26c28e8bffe12b27df5b828404afed9e1949191 (diff) |
Restore __ALIGN_MASK()
Fix lib/bitmap.c compile failure due to __ALIGN_KERNEL changes.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 284ea995646e..db6717d0fd6f 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -40,6 +40,7 @@ extern const char linux_proc_banner[]; | |||
40 | #define STACK_MAGIC 0xdeadbeef | 40 | #define STACK_MAGIC 0xdeadbeef |
41 | 41 | ||
42 | #define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) | 42 | #define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) |
43 | #define __ALIGN_MASK(x, mask) __ALIGN_KERNEL_MASK((x), (mask)) | ||
43 | #define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) | 44 | #define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) |
44 | #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) | 45 | #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) |
45 | 46 | ||