Merge branch 'sh/stable-updates'
Paul Mundt [Mon, 26 Apr 2010 07:08:27 +0000 (16:08 +0900)]
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c

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

1  2 
arch/sh/include/cpu-sh4/cpu/dma-register.h
arch/sh/kernel/dwarf.c
arch/sh/kernel/process.c
arch/sh/mm/pmb.c
drivers/clocksource/sh_cmt.c
drivers/clocksource/sh_mtu2.c
drivers/clocksource/sh_tmu.c
drivers/dma/shdma.c
drivers/serial/sh-sci.c
drivers/sh/intc.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>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
  
Simple merge
Simple merge