From 6edd0dbb507bd59bfaec2d4981e340f745ccf6fb Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 26 Nov 2006 19:05:22 -0800 Subject: [PATCH] --- yaml --- r: 41103 b: refs/heads/master c: 2ea5814472c3c910aed5c5b60f1f3b1000e353f1 h: refs/heads/master i: 41101: 5123c3adebdc9024566d1fd3d5d06a28f9e586a4 41099: 089b2315dfe73a5af5bf8d4eca82c4ce5b66ec4d 41095: 79b58bfcdaa812e619aae3b6873346b297476c72 41087: a3d20334c43ef70f7c0419bbccd13df00074934c v: v3 --- [refs] | 2 +- trunk/include/linux/kernel.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9cac0a2157da..ff1db3fd47f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9c3b86f2ab79f7f6e87eb735f9cc4508b73fc48 +refs/heads/master: 2ea5814472c3c910aed5c5b60f1f3b1000e353f1 diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index 24b611147adb..b9b5e4ba166a 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -30,8 +30,10 @@ extern const char linux_banner[]; #define STACK_MAGIC 0xdeadbeef +#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) +#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) + #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -#define ALIGN(x,a) (((x)+(a)-1UL)&~((a)-1UL)) #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))