diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-27 08:44:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-27 08:44:53 -0500 |
| commit | cc11f372e9371ec3a3dad02396dbe0a55eec0b8f (patch) | |
| tree | fd22bdac975ee61053e787ad96c912fddc485370 /include/linux/cache.h | |
| parent | 5b4af8b6397c2da6e3c05893d974b6559441901d (diff) | |
| parent | 77d143de75812596a58d126606f42d1214e09dde (diff) | |
Merge branch 'master' into staging-next
We need the network changes in staging-next in order to be able to fix
up the rtl8821ae driver to build properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/cache.h')
| -rw-r--r-- | include/linux/cache.h | 4 |
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 @@ | |||
| 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 |