[PATCH 0/5] metag: minor fixes after stuff in -next

[PATCH 0/5] metag: minor fixes after stuff in -next

[James Hogan]

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(-)

-- 
1.8.1.2

[PATCH 1/5] metag: Provide dma_get_sgtable()

[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>.

Metag does not use dma_map_ops yet, hence it should implement it as an
inline stub using dma_common_get_sgtable().

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/metag/include/asm/dma-mapping.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/metag/include/asm/dma-mapping.h b/arch/metag/include/asm/dma-mapping.h
index b5f80a6..14b23ef 100644
--- a/arch/metag/include/asm/dma-mapping.h
+++ b/arch/metag/include/asm/dma-mapping.h
@@ -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
-- 
1.8.1.2

Re: [PATCH 1/5] metag: Provide dma_get_sgtable()

[Marek Szyprowski]

Hello,

On 2/26/2013 12:03 PM, James Hogan wrote:
> 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().
>
> Signed-off-by: James Hogan <james.hogan@imgtec.com>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>

Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>

> ---
>   arch/metag/include/asm/dma-mapping.h | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/arch/metag/include/asm/dma-mapping.h b/arch/metag/include/asm/dma-mapping.h
> index b5f80a6..14b23ef 100644
> --- a/arch/metag/include/asm/dma-mapping.h
> +++ b/arch/metag/include/asm/dma-mapping.h
> @@ -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

Best regards
-- 
Marek Szyprowski
Samsung Poland R&D Center

Re: [PATCH 1/5] metag: Provide dma_get_sgtable()

[James Hogan]

On 27/02/13 07:09, Marek Szyprowski wrote:
> Hello,
> 
> On 2/26/2013 12:03 PM, James Hogan wrote:
>> 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().
>>
>> Signed-off-by: James Hogan <james.hogan@imgtec.com>
>> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
>> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> 
> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>

Thanks Marek,

Cheers
James

[PATCH 2/5] metag: remove GENERIC_SIGALTSTACK

[James Hogan]

The 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.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
---
 arch/metag/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 30adc78..46d0fa7 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -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
-- 
1.8.1.2

[PATCH 3/5] metag: remove select CONFIG_HAVE_IRQ_WORK

[James Hogan]

Since commit "irq_work: Remove CONFIG_HAVE_IRQ_WORK" the Kconfig symbol
HAVE_IRQ_WORK has gone. Remove the select from METAG too.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
---
 arch/metag/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 46d0fa7..bc3de76 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -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
-- 
1.8.1.2

[PATCH 4/5] metag: remove CONFIG_EXPERIMENTAL from defconfigs

[James Hogan]

Since 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.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
 arch/metag/configs/meta1_defconfig     | 1 -
 arch/metag/configs/meta2_defconfig     | 1 -
 arch/metag/configs/meta2_smp_defconfig | 1 -
 3 files changed, 3 deletions(-)

diff --git a/arch/metag/configs/meta1_defconfig b/arch/metag/configs/meta1_defconfig
index ad663ca..c35a75e 100644
--- a/arch/metag/configs/meta1_defconfig
+++ b/arch/metag/configs/meta1_defconfig
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_LOG_BUF_SHIFT=13
diff --git a/arch/metag/configs/meta2_defconfig b/arch/metag/configs/meta2_defconfig
index 47922e93..fb31484 100644
--- a/arch/metag/configs/meta2_defconfig
+++ b/arch/metag/configs/meta2_defconfig
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
diff --git a/arch/metag/configs/meta2_smp_defconfig b/arch/metag/configs/meta2_smp_defconfig
index f508250..6c7b777 100644
--- a/arch/metag/configs/meta2_smp_defconfig
+++ b/arch/metag/configs/meta2_smp_defconfig
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-- 
1.8.1.2

[PATCH 5/5] metag: remove unused ARCH_NO_VIRT_TO_BUS

[James Hogan]

Since 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.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
 arch/metag/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index bc3de76..afc8973 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -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
 
-- 
1.8.1.2