diff options
| -rw-r--r-- | arch/sh64/kernel/setup.c | 4 | ||||
| -rw-r--r-- | arch/sh64/kernel/signal.c | 1 | ||||
| -rw-r--r-- | include/asm-sh64/dma-mapping.h | 18 |
3 files changed, 18 insertions, 5 deletions
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c index 53e9d20a874a..2b7264c0c6f7 100644 --- a/arch/sh64/kernel/setup.c +++ b/arch/sh64/kernel/setup.c | |||
| @@ -59,10 +59,6 @@ | |||
| 59 | #include <asm/setup.h> | 59 | #include <asm/setup.h> |
| 60 | #include <asm/smp.h> | 60 | #include <asm/smp.h> |
| 61 | 61 | ||
| 62 | #ifdef CONFIG_VT | ||
| 63 | #include <linux/console.h> | ||
| 64 | #endif | ||
| 65 | |||
| 66 | struct screen_info screen_info; | 62 | struct screen_info screen_info; |
| 67 | 63 | ||
| 68 | #ifdef CONFIG_BLK_DEV_RAM | 64 | #ifdef CONFIG_BLK_DEV_RAM |
diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c index 0bb4a8f94276..79fc48cf54c6 100644 --- a/arch/sh64/kernel/signal.c +++ b/arch/sh64/kernel/signal.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/ptrace.h> | 25 | #include <linux/ptrace.h> |
| 26 | #include <linux/unistd.h> | 26 | #include <linux/unistd.h> |
| 27 | #include <linux/stddef.h> | 27 | #include <linux/stddef.h> |
| 28 | #include <linux/personality.h> | ||
| 29 | #include <asm/ucontext.h> | 28 | #include <asm/ucontext.h> |
| 30 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| 31 | #include <asm/pgtable.h> | 30 | #include <asm/pgtable.h> |
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h index d505f357f819..de4309960207 100644 --- a/include/asm-sh64/dma-mapping.h +++ b/include/asm-sh64/dma-mapping.h | |||
| @@ -141,6 +141,24 @@ static inline void dma_sync_single_for_device(struct device *dev, | |||
| 141 | dma_sync_single(dev, dma_handle, size, dir); | 141 | dma_sync_single(dev, dma_handle, size, dir); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static inline void dma_sync_single_range_for_cpu(struct device *dev, | ||
| 145 | dma_addr_t dma_handle, | ||
| 146 | unsigned long offset, | ||
| 147 | size_t size, | ||
| 148 | enum dma_data_direction direction) | ||
| 149 | { | ||
| 150 | dma_sync_single_for_cpu(dev, dma_handle+offset, size, direction); | ||
| 151 | } | ||
| 152 | |||
| 153 | static inline void dma_sync_single_range_for_device(struct device *dev, | ||
| 154 | dma_addr_t dma_handle, | ||
| 155 | unsigned long offset, | ||
| 156 | size_t size, | ||
| 157 | enum dma_data_direction direction) | ||
| 158 | { | ||
| 159 | dma_sync_single_for_device(dev, dma_handle+offset, size, direction); | ||
| 160 | } | ||
| 161 | |||
| 144 | static inline void dma_sync_sg_for_cpu(struct device *dev, | 162 | static inline void dma_sync_sg_for_cpu(struct device *dev, |
| 145 | struct scatterlist *sg, int nelems, | 163 | struct scatterlist *sg, int nelems, |
| 146 | enum dma_data_direction dir) | 164 | enum dma_data_direction dir) |
