diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-08-21 06:26:24 -0400 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-10-02 02:58:07 -0400 |
| commit | 48aa820f1e3824e46dde6251db98e5961abf605d (patch) | |
| tree | 20cac9fd267b7e8bc43e47165c631bb6cadef15b /arch/arm/include | |
| parent | 0fa478df444f5837336d7e2fd0b41643c8d704c2 (diff) | |
ARM: kill off arch_is_coherent
With ixp2xxx removed, there are no platforms that define arch_is_coherent,
so the last occurrences of arch_is_coherent can be removed. Any new
platform with coherent i/o should use coherent dma mapping functions.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/barrier.h | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/memory.h | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h index 05112380dc53..8dcd9c702d90 100644 --- a/arch/arm/include/asm/barrier.h +++ b/arch/arm/include/asm/barrier.h | |||
| @@ -44,10 +44,9 @@ | |||
| 44 | #define rmb() dsb() | 44 | #define rmb() dsb() |
| 45 | #define wmb() mb() | 45 | #define wmb() mb() |
| 46 | #else | 46 | #else |
| 47 | #include <asm/memory.h> | 47 | #define mb() barrier() |
| 48 | #define mb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) | 48 | #define rmb() barrier() |
| 49 | #define rmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) | 49 | #define wmb() barrier() |
| 50 | #define wmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) | ||
| 51 | #endif | 50 | #endif |
| 52 | 51 | ||
| 53 | #ifndef CONFIG_SMP | 52 | #ifndef CONFIG_SMP |
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 5f6ddcc56452..73cf03aa981e 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h | |||
| @@ -275,14 +275,6 @@ static inline __deprecated void *bus_to_virt(unsigned long x) | |||
| 275 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) | 275 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) |
| 276 | #define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) | 276 | #define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) |
| 277 | 277 | ||
| 278 | /* | ||
| 279 | * Optional coherency support. Currently used only by selected | ||
| 280 | * Intel XSC3-based systems. | ||
| 281 | */ | ||
| 282 | #ifndef arch_is_coherent | ||
| 283 | #define arch_is_coherent() 0 | ||
| 284 | #endif | ||
| 285 | |||
| 286 | #endif | 278 | #endif |
| 287 | 279 | ||
| 288 | #include <asm-generic/memory_model.h> | 280 | #include <asm-generic/memory_model.h> |