summaryrefslogtreecommitdiff
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-12-30 13:32:59 -0600
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-12-30 13:32:59 -0600
commit1836ce84119574e86e8e806f38f479d8a66d482c (patch)
tree81f30b92e92570ae624397da99fa903abba4307d /include/linux/kernel.h
parent5c8daf122af3ec6ea55204ad58264677fdf425a0 (diff)
parent214fd2320f43b49efa5de18d85bc72c48f99e531 (diff)
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5
into tp1.ruhr-uni-bochum.de:/scratch/kai/linux-2.5.make
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index f3cadd9416ad..9cb6277f5b86 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -28,6 +28,7 @@
#define STACK_MAGIC 0xdeadbeef
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
#define KERN_EMERG "<0>" /* system is unusable */
#define KERN_ALERT "<1>" /* action must be taken immediately */