Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/kernel/dwarf.c
	drivers/dma/shdma.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --cc arch/sh/include/cpu-sh4/cpu/dma-register.h
Simple merge

diff --cc arch/sh/kernel/dwarf.c
index 8c09f62cebd16e9320b036ad71c3dc0e6f5332ca,a8234b2010d183c8c0e9374d91f402b799920f0f..5ec1d1818691e5968609e58087e0502f49eb7475
--- 1/arch/sh/kernel/dwarf.c
--- 2/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@@ -22,7 -22,7 +22,8 @@@
  #include <linux/mm.h>
  #include <linux/elf.h>
  #include <linux/ftrace.h>
 +#include <linux/module.h>
+ #include <linux/slab.h>
  #include <asm/dwarf.h>
  #include <asm/unwinder.h>
  #include <asm/sections.h>

diff --cc arch/sh/kernel/process.c
Simple merge

diff --cc arch/sh/mm/pmb.c
Simple merge

diff --cc drivers/clocksource/sh_cmt.c
Simple merge

diff --cc drivers/clocksource/sh_mtu2.c
Simple merge

diff --cc drivers/clocksource/sh_tmu.c
Simple merge

diff --cc drivers/dma/shdma.c
index aab352a63a4a6716b492018ecb03dc631123f05d,6f25a20de99fbc39e30c6bbbdef0f5e5e3f81fb4..323afef77802842ee481d505e4713b500c560967
--- 1/drivers/dma/shdma.c
--- 2/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@@ -296,14 -299,18 +298,18 @@@ static int sh_dmae_alloc_chan_resources
         * never runs concurrently with itself or free_chan_resources.
         */
        if (param) {
 -              struct sh_dmae_slave_config *cfg;
 +              const struct sh_dmae_slave_config *cfg;
  
 -              cfg = sh_dmae_find_slave(sh_chan, param->slave_id);
 +              cfg = sh_dmae_find_slave(sh_chan, param);
-               if (!cfg)
-                       return -EINVAL;
+               if (!cfg) {
+                       ret = -EINVAL;
+                       goto efindslave;
+               }
  
-               if (test_and_set_bit(param->slave_id, sh_dmae_slave_used))
-                       return -EBUSY;
+               if (test_and_set_bit(param->slave_id, sh_dmae_slave_used)) {
+                       ret = -EBUSY;
+                       goto etestused;
+               }
  
                param->config = cfg;
  

diff --cc drivers/serial/sh-sci.c
Simple merge

diff --cc drivers/sh/intc.c
Simple merge