diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 17:57:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 17:57:51 -0800 |
| commit | 5be95b7e24bde4d93ff1bff5911b303043753168 (patch) | |
| tree | 00ccba63052e5f9b5adbf13e48f3fdbcab77a48c /arch/hexagon/include/asm/cache.h | |
| parent | 971d9e07e18fa3684e7fbc932f01aa2a0682f232 (diff) | |
| parent | 8914d7e857807e1e60975000cba3750c9b2643e8 (diff) | |
| download | linux-5be95b7e24bde4d93ff1bff5911b303043753168.tar.gz linux-5be95b7e24bde4d93ff1bff5911b303043753168.tar.bz2 linux-5be95b7e24bde4d93ff1bff5911b303043753168.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel
Pull arch/hexagon updates from Richard Kuo:
"Build cleanup and a few misc fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
Hexagon: fix signal delivery for debug traps
Hexagon: set ARCH_DMA_MINALIGN
Hexagon: fix alignment of init_task in RW_DATA_SECTION
hexagon: Fix build failures in linux-next
Diffstat (limited to 'arch/hexagon/include/asm/cache.h')
| -rw-r--r-- | arch/hexagon/include/asm/cache.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h index 263511719a4a..69952c184207 100644 --- a/arch/hexagon/include/asm/cache.h +++ b/arch/hexagon/include/asm/cache.h @@ -1,7 +1,7 @@ /* * Cache definitions for the Hexagon architecture * - * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved. + * Copyright (c) 2010-2011,2014 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -25,6 +25,8 @@ #define L1_CACHE_SHIFT (5) #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES + #define __cacheline_aligned __aligned(L1_CACHE_BYTES) #define ____cacheline_aligned __aligned(L1_CACHE_BYTES) |