diff options
Diffstat (limited to 'arch/nios2')
| -rw-r--r--[-rwxr-xr-x] | arch/nios2/boot/dts/10m50_devboard.dts | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | arch/nios2/configs/10m50_defconfig | 0 | ||||
| -rw-r--r-- | arch/nios2/include/asm/Kbuild | 2 | ||||
| -rw-r--r-- | arch/nios2/include/asm/dma-mapping.h | 4 | ||||
| -rw-r--r-- | arch/nios2/mm/dma-mapping.c | 2 | ||||
| -rw-r--r-- | arch/nios2/mm/extable.c | 2 | ||||
| -rw-r--r-- | arch/nios2/mm/fault.c | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/arch/nios2/boot/dts/10m50_devboard.dts b/arch/nios2/boot/dts/10m50_devboard.dts index f362b2224ee7..f362b2224ee7 100755..100644 --- a/arch/nios2/boot/dts/10m50_devboard.dts +++ b/arch/nios2/boot/dts/10m50_devboard.dts diff --git a/arch/nios2/configs/10m50_defconfig b/arch/nios2/configs/10m50_defconfig index 8b2a30b3b34f..8b2a30b3b34f 100755..100644 --- a/arch/nios2/configs/10m50_defconfig +++ b/arch/nios2/configs/10m50_defconfig diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild index d63330e88379..aaa3c218b56c 100644 --- a/arch/nios2/include/asm/Kbuild +++ b/arch/nios2/include/asm/Kbuild @@ -6,7 +6,6 @@ generic-y += bitsperlong.h generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h -generic-y += cputime.h generic-y += current.h generic-y += device.h generic-y += div64.h @@ -63,3 +62,4 @@ generic-y += user.h generic-y += vga.h generic-y += word-at-a-time.h generic-y += xor.h +generic-y += kprobes.h diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h index bec8ac8e6ad2..7b3c6f280293 100644 --- a/arch/nios2/include/asm/dma-mapping.h +++ b/arch/nios2/include/asm/dma-mapping.h @@ -10,9 +10,9 @@ #ifndef _ASM_NIOS2_DMA_MAPPING_H #define _ASM_NIOS2_DMA_MAPPING_H -extern struct dma_map_ops nios2_dma_ops; +extern const struct dma_map_ops nios2_dma_ops; -static inline struct dma_map_ops *get_dma_ops(struct device *dev) +static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) { return &nios2_dma_ops; } diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c index f6a5dcf9d682..7040c1adbb5e 100644 --- a/arch/nios2/mm/dma-mapping.c +++ b/arch/nios2/mm/dma-mapping.c @@ -192,7 +192,7 @@ static void nios2_dma_sync_sg_for_device(struct device *dev, } -struct dma_map_ops nios2_dma_ops = { +const struct dma_map_ops nios2_dma_ops = { .alloc = nios2_dma_alloc, .free = nios2_dma_free, .map_page = nios2_dma_map_page, diff --git a/arch/nios2/mm/extable.c b/arch/nios2/mm/extable.c index 4d2fc5a589d0..2574dba0407d 100644 --- a/arch/nios2/mm/extable.c +++ b/arch/nios2/mm/extable.c @@ -8,7 +8,7 @@ * for more details. */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c index affc4eb3f89e..e7a14e1e0d6b 100644 --- a/arch/nios2/mm/fault.c +++ b/arch/nios2/mm/fault.c @@ -21,7 +21,7 @@ #include <linux/ptrace.h> #include <linux/mman.h> #include <linux/mm.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> #include <linux/ptrace.h> |