diff options
Diffstat (limited to 'arch/sh/mm')
-rw-r--r-- | arch/sh/mm/consistent.c | 2 | ||||
-rw-r--r-- | arch/sh/mm/pg-nommu.c | 1 | ||||
-rw-r--r-- | arch/sh/mm/tlb-nommu.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index 64b8f7f96f9a..7619a0fae086 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c | |||
@@ -44,7 +44,7 @@ void *dma_alloc_coherent(struct device *dev, size_t size, | |||
44 | */ | 44 | */ |
45 | dma_cache_sync(dev, ret, size, DMA_BIDIRECTIONAL); | 45 | dma_cache_sync(dev, ret, size, DMA_BIDIRECTIONAL); |
46 | 46 | ||
47 | ret_nocache = ioremap_nocache(virt_to_phys(ret), size); | 47 | ret_nocache = (void __force *)ioremap_nocache(virt_to_phys(ret), size); |
48 | if (!ret_nocache) { | 48 | if (!ret_nocache) { |
49 | free_pages((unsigned long)ret, order); | 49 | free_pages((unsigned long)ret, order); |
50 | return NULL; | 50 | return NULL; |
diff --git a/arch/sh/mm/pg-nommu.c b/arch/sh/mm/pg-nommu.c index 677dd57f0877..91ed4e695ff7 100644 --- a/arch/sh/mm/pg-nommu.c +++ b/arch/sh/mm/pg-nommu.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
15 | #include <asm/page.h> | 15 | #include <asm/page.h> |
16 | #include <asm/uaccess.h> | ||
16 | 17 | ||
17 | void copy_page(void *to, void *from) | 18 | void copy_page(void *to, void *from) |
18 | { | 19 | { |
diff --git a/arch/sh/mm/tlb-nommu.c b/arch/sh/mm/tlb-nommu.c index 15111bc7ddd6..71c742b5aee3 100644 --- a/arch/sh/mm/tlb-nommu.c +++ b/arch/sh/mm/tlb-nommu.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
12 | #include <asm/pgtable.h> | 12 | #include <asm/pgtable.h> |
13 | #include <asm/tlbflush.h> | ||
13 | 14 | ||
14 | /* | 15 | /* |
15 | * Nothing too terribly exciting here .. | 16 | * Nothing too terribly exciting here .. |