1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cache.h b/include/linux/cache.h
index 4c570653ab84..17e7e82d2aa7 100644
--- a/include/linux/cache.h
+++ b/include/linux/cache.h
@@ -1,11 +1,11 @@
 #ifndef __LINUX_CACHE_H
 #define __LINUX_CACHE_H
-#include <linux/kernel.h>
+#include <uapi/linux/kernel.h>
 #include <asm/cache.h>
 #ifndef L1_CACHE_ALIGN
-#define L1_CACHE_ALIGN(x) ALIGN(x, L1_CACHE_BYTES)
+#define L1_CACHE_ALIGN(x) __ALIGN_KERNEL(x, L1_CACHE_BYTES)
 #endif
 #ifndef SMP_CACHE_BYTES

diff --git a/include/linux/cache.h b/include/linux/cache.h index 4c570653ab84..17e7e82d2aa7 100644 --- a/include/linux/cache.h +++ b/include/linux/cache.h
@@ -1,11 +1,11 @@
1	#ifndef __LINUX_CACHE_H	1	#ifndef __LINUX_CACHE_H
2	#define __LINUX_CACHE_H	2	#define __LINUX_CACHE_H
3		3
4	#include <linux/kernel.h>	4	#include <uapi/linux/kernel.h>
5	#include <asm/cache.h>	5	#include <asm/cache.h>
6		6
7	#ifndef L1_CACHE_ALIGN	7	#ifndef L1_CACHE_ALIGN
8	#define L1_CACHE_ALIGN(x) ALIGN(x, L1_CACHE_BYTES)	8	#define L1_CACHE_ALIGN(x) __ALIGN_KERNEL(x, L1_CACHE_BYTES)
9	#endif	9	#endif
10		10
11	#ifndef SMP_CACHE_BYTES	11	#ifndef SMP_CACHE_BYTES