diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
| commit | 9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch) | |
| tree | c76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch | |
| parent | 3951f9492f31b59602a9a7c46fbb041be0929be0 (diff) | |
| download | upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2 upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip | |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43564
Diffstat (limited to 'target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch')
| -rw-r--r-- | target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch index ed01fe128e..25a28e89be 100644 --- a/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch +++ b/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/arch/arm/include/asm/glue-cache.h -=================================================================== ---- linux-3.14.18.orig/arch/arm/include/asm/glue-cache.h -+++ linux-3.14.18/arch/arm/include/asm/glue-cache.h +--- a/arch/arm/include/asm/glue-cache.h ++++ b/arch/arm/include/asm/glue-cache.h @@ -156,11 +156,19 @@ extern inline void nop_dma_unmap_area(co #define __cpuc_flush_user_range __glue(_CACHE,_flush_user_cache_range) #define __cpuc_coherent_kern_range __glue(_CACHE,_coherent_kern_range) @@ -22,11 +20,9 @@ Index: linux-3.14.18/arch/arm/include/asm/glue-cache.h #endif #endif -Index: linux-3.14.18/arch/arm/mm/Kconfig -=================================================================== ---- linux-3.14.18.orig/arch/arm/mm/Kconfig -+++ linux-3.14.18/arch/arm/mm/Kconfig -@@ -843,6 +843,17 @@ config DMA_CACHE_RWFO +--- a/arch/arm/mm/Kconfig ++++ b/arch/arm/mm/Kconfig +@@ -844,6 +844,17 @@ config DMA_CACHE_RWFO in hardware, other workarounds are needed (e.g. cache maintenance broadcasting in software via FIQ). @@ -44,10 +40,8 @@ Index: linux-3.14.18/arch/arm/mm/Kconfig config OUTER_CACHE bool -Index: linux-3.14.18/arch/arm/mm/flush.c -=================================================================== ---- linux-3.14.18.orig/arch/arm/mm/flush.c -+++ linux-3.14.18/arch/arm/mm/flush.c +--- a/arch/arm/mm/flush.c ++++ b/arch/arm/mm/flush.c @@ -291,7 +291,11 @@ void flush_dcache_page(struct page *page mapping = page_mapping(page); |