Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 664481ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh 

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  sh: fix clock-sh7757 for the latest sh_mobile_sdhi driver
  serial: sh-sci: use serial_port_in/out vs sci_in/out.
  sh: vsyscall: Fix up .eh_frame generation.
  sh: dma: Fix up device attribute mismatch from sysdev fallout.
  sh: dwarf unwinder depends on SHcompact.
  sh: fix up fallout from system.h disintegration.
parents d6a624ee a052d2c3

arch/sh/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ config DUMP_CODE 
config DWARF_UNWINDER

	bool "Enable the DWARF unwinder for stacktraces"

	select FRAME_POINTER

	depends on SUPERH32

	default n

	help

	  Enabling this option will make stacktraces more accurate, at

arch/sh/boards/board-sh7785lcr.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <cpu/sh7785.h>

#include <asm/heartbeat.h>

#include <asm/clock.h>

#include <asm/bl_bit.h>



/*

 * NOTE: This board has 2 physical memory maps.

arch/sh/boards/mach-hp6xx/pm.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/gfp.h>

#include <asm/io.h>

#include <asm/hd64461.h>

#include <asm/bl_bit.h>

#include <mach/hp6xx.h>

#include <cpu/dac.h>

#include <asm/freq.h>

arch/sh/drivers/dma/dma-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int __init dma_subsys_init(void) 
	if (unlikely(ret))

		return ret;



	return device_create_file(dma_subsys.dev_root, &dev_attr_devices.attr);

	return device_create_file(dma_subsys.dev_root, &dev_attr_devices);

}

postcore_initcall(dma_subsys_init);

arch/sh/kernel/cpu/fpu.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/slab.h>

#include <asm/processor.h>

#include <asm/fpu.h>

#include <asm/traps.h>



int init_fpu(struct task_struct *tsk)

{