metag: minor fixes after stuff in -next
cover metag: minor fixes after stuff in -next
Here are a few trivial fixes to arch/metag/. All except the first patch depend on stuff in -next. Except arch/metag, only the last patch depends on something not yet in mainline.
James Hogan (5):
metag: Provide dma_get_sgtable()
metag: remove GENERIC_SIGALTSTACK
metag: remove select CONFIG_HAVE_IRQ_WORK
metag: remove CONFIG_EXPERIMENTAL from defconfigs
metag: remove unused ARCH_NO_VIRT_TO_BUS
arch/metag/Kconfig | 5 ----- arch/metag/configs/meta1_defconfig | 1 - arch/metag/configs/meta2_defconfig | 1 - arch/metag/configs/meta2_smp_defconfig | 1 - arch/metag/include/asm/dma-mapping.h | 7 +++++++ 5 files changed, 7 insertions(+), 8 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/5 metag: Provide dma_get_sgtable()
metag/allmodconfig:
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function 'vb2_dc_get_base_sgt':drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function 'dma_get_sgtable'
For architectures using dma_map_ops, dma_get_sgtable() is provided in <asm-generic/dma-mapping-common.h>.
Metag does not use dma_map_ops yet, hence it should implement it as an inline stub using dma_common_get_sgtable().
--- arch/metag/include/asm/dma-mapping.h | 7 +++++++ 1 file changed, 7 insertions(+)
arch/metag/include/asm/dma-mapping.h +7 -0
@@ -180,4 +180,11 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size, { } +/* drivers/base/dma-mapping.c */ +extern int dma_common_get_sgtable (struct device *dev,struct sg_table *sgt, +void *cpu_addr,dma_addr_t dma_addr, +size_t size); + +#define dma_get_sgtable (d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s) +#endif
Signature · 1 line
1.8.1.2
Re: [PATCH 1/5] metag: Provide dma_get_sgtable()
Hello,
Quoted 8 lines · James Hogan
metag/allmodconfig:
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function 'vb2_dc_get_base_sgt':drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function 'dma_get_sgtable'For architectures using
dma_map_ops,dma_get_sgtable()is provided in <asm-generic/dma-mapping-common.h>.
Quoted 6 lines
Metag does not use
dma_map_opsyet, hence it should implement it as an inline stub usingdma_common_get_sgtable().Signed-off-by James Hogan <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Marek Szyprowski <[email protected]>
Quoted 10 lines
--- arch/metag/include/asm/dma-mapping.h | 7 +++++++ 1 file changed, 7 insertions(+)arch/metag/include/asm/dma-mapping.h +0
-0@@ -180,4 +180,11 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size, {
arch/metag/include/asm/dma-mapping.h dma_cache_sync(struct device *dev, void *vaddr, size_t size, · line 190
Quoted 10 lines
arch/metag/include/asm/dma-mapping.h +7
-0} +/* drivers/base/dma-mapping.c */ +extern int dma_common_get_sgtable (struct device *dev,struct sg_table *sgt, +void *cpu_addr,dma_addr_t dma_addr, +size_t size); + +#define dma_get_sgtable (d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s) +#endif
Best regards
Signature · 2 lines
Marek Szyprowski Samsung Poland R&D Center
Re: [PATCH 1/5] metag: Provide dma_get_sgtable()
Quoted 13 lines · Marek Szyprowski
Hello,
Quoted 10 lines · James Hogan
metag/allmodconfig:
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function 'vb2_dc_get_base_sgt':drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function 'dma_get_sgtable'For architectures using
dma_map_ops,dma_get_sgtable()is provided in <asm-generic/dma-mapping-common.h>.
Quoted 8 lines
Quoted 6 lines
Metag does not use
dma_map_opsyet, hence it should implement it as an inline stub usingdma_common_get_sgtable().Signed-off-by James Hogan <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Marek Szyprowski <[email protected]>Acked-by Marek Szyprowski <[email protected]>
Thanks Marek,
Cheers
James
PATCH 2/5 metag: remove GENERIC_SIGALTSTACK
In reply to James HoganThe commit "burying unused conditionals" removed among other things the CONFIG_GENERIC_SIGALTSTACK Kconfig symbol as it's selected by every architecture. Therefore remove the select from CONFIG_METAG too.
--- arch/metag/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/metag/Kconfig +0 -1
@@ -8,7 +8,6 @@ config METAG select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS select GENERIC_IRQ_SHOW - select GENERIC_SIGALTSTACK select GENERIC_SMP_IDLE_THREAD select HAVE_64BIT_ALIGNED_ACCESS select HAVE_ARCH_TRACEHOOK
Signature · 1 line
1.8.1.2
PATCH 3/5 metag: remove select CONFIG_HAVE_IRQ_WORK
In reply to James HoganSince commit "irq_work: Remove CONFIG_HAVE_IRQ_WORK" the Kconfig symbol HAVE_IRQ_WORK has gone. Remove the select from METAG too.
--- arch/metag/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/metag/Kconfig +0 -1
@@ -18,7 +18,6 @@ config METAG select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACE_MCOUNT_TEST select HAVE_GENERIC_HARDIRQS - select HAVE_IRQ_WORK select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZO
Signature · 1 line
1.8.1.2
PATCH 4/5 metag: remove CONFIG_EXPERIMENTAL from defconfigs
In reply to James HoganSince upstream commit "make CONFIG_EXPERIMENTAL invisible and default" CONFIG_EXPERIMENTAL is invisible and defaults to y pending it's removal. Therefore remove the explicit selection from the metag defconfig files.
--- arch/metag/configs/meta1_defconfig | 1 - arch/metag/configs/meta2_defconfig | 1 - arch/metag/configs/meta2_smp_defconfig | 1 - 3 files changed, 3 deletions(-)
arch/metag/configs/meta1_defconfig +0 -1
@@ -1,4 +1,3 @@ -CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_LOG_BUF_SHIFT=13
arch/metag/configs/meta2_defconfig +0 -1
@@ -1,4 +1,3 @@ -CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y
arch/metag/configs/meta2_smp_defconfig +0 -1
@@ -1,4 +1,3 @@ -CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y
Signature · 1 line
1.8.1.2
PATCH 5/5 metag: remove unused ARCH_NO_VIRT_TO_BUS
In reply to James HoganSince the patch "arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS", ARCH_NO_VIRT_TO_BUS has been removed in favour of architectures selecting HAVE_VIRT_TO_BUS if they do provide the virt_to_bus/bus_to_virt interfaces. Therefore remove the now superfluous definition of ARCH_NO_VIRT_TO_BUS in arch/metag/Kconfig.
--- arch/metag/Kconfig | 3 --- 1 file changed, 3 deletions(-)
arch/metag/Kconfig +0 -3
@@ -33,9 +33,6 @@ config METAG select OF_EARLY_FLATTREE select SPARSE_IRQ -config ARCH_NO_VIRT_TO_BUS - def_bool y - config STACKTRACE_SUPPORT def_bool y
Signature · 1 line
1.8.1.2