aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2006-09-22 22:31:36 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-23 11:34:42 -0700
commit4c8bd7eeee4c8f157fb61fb64b57500990b42e0e (patch)
tree6d410adb72e69270c348a09ece9f5eb3a297af8a /include/linux/kernel.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff)
downloadlinux-dev-4c8bd7eeee4c8f157fb61fb64b57500990b42e0e.tar.xz
linux-dev-4c8bd7eeee4c8f157fb61fb64b57500990b42e0e.zip
[KERNEL] Do not truncate to 'int' in ALIGN() macro.
Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
-rw-r--r--include/linux/kernel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 851aa1bcfc1a..2b2ae4fdce8b 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -31,7 +31,7 @@ extern const char linux_banner[];
#define STACK_MAGIC 0xdeadbeef
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
+#define ALIGN(x,a) (((x)+(a)-1UL)&~((a)-1UL))
#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))