diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-18 04:43:56 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-18 04:43:56 -0400 |
| commit | e19b9137142988bec5a76c5f8bdf12a77ea802b0 (patch) | |
| tree | b36c83fa93da7f18c1331252fb82a87431697443 /include/linux/cache.h | |
| parent | 2fae6a860ca9adb0c881f6dcd633df775c2520e9 (diff) | |
| parent | e40d641099213145a034981e646dc2180a488152 (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/Makefile
Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
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 |