summaryrefslogtreecommitdiff
path: root/include/linux/cache.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2003-01-01 08:53:32 +1100
committerPaul Mackerras <paulus@samba.org>2003-01-01 08:53:32 +1100
commit40f576b5364c98919b0f913dec3f8c6d92e4ee0d (patch)
treea2a81aedf495b4409fa1e3f595f867ce1ae39d82 /include/linux/cache.h
parent0002932fedb709a811c16e77fcf4f03acbca35ee (diff)
parent43fb68dc00a8ab0b728e27c2a8fd4033d2ba0932 (diff)
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc
Diffstat (limited to 'include/linux/cache.h')
-rw-r--r--include/linux/cache.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/cache.h b/include/linux/cache.h
index 95faa6ec3aa7..3db3832f35cb 100644
--- a/include/linux/cache.h
+++ b/include/linux/cache.h
@@ -1,11 +1,10 @@
#ifndef __LINUX_CACHE_H
#define __LINUX_CACHE_H
+#include <linux/kernel.h>
#include <linux/config.h>
#include <asm/cache.h>
-#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
-
#ifndef L1_CACHE_ALIGN
#define L1_CACHE_ALIGN(x) ALIGN(x, L1_CACHE_BYTES)
#endif