Commit 790b9d4b 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: Kill off additional asm-generic wrappers.
  sh: Setup CROSS_COMPILE at the top
  sh: Fix up link time defsym warnings.
  sh: use the new generic strnlen_user() function
  sh: switch to generic strncpy_from_user().
  sh: Kill off last dead UBC header
  serial: sh-sci: Make probe fail for ports that exceed the maximum count
  serial: sh-sci: Fix probe error paths
  clocksource: sh_tmu: Use clockevents_config_and_register().
  clocksource: sh_tmu: Convert timer lock to raw spinlock.
  clocksource: sh_mtu2: Convert timer lock to raw spinlock.
  clocksource: sh_cmt: Convert timer lock to raw spinlock.
  bug.h: need linux/kernel.h for TAINT_WARN.
  sh: convert to kbuild asm-generic support.
  sh64: Fix up fallout from generic init_task conversion.
  sh: arch/sh/kernel/process.c needs asm/fpu.h for unlazy_fpu().
parents c02feeea 380622e9

arch/sh/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ config SUPERH 
	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_CLOCKEVENTS

	select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast

arch/sh/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ 
# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

ifneq ($(SUBARCH),$(ARCH))

  ifeq ($(CROSS_COMPILE),)

    CROSS_COMPILE := $(call cc-cross-prefix, $(UTS_MACHINE)-linux-  $(UTS_MACHINE)-linux-gnu-  $(UTS_MACHINE)-unknown-linux-gnu-)

  endif

endif



isa-y					:= any

isa-$(CONFIG_SH_DSP)			:= sh

isa-$(CONFIG_CPU_SH2)			:= sh2
@@ -106,19 +112,13 @@ LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \ 
KBUILD_DEFCONFIG	:= cayman_defconfig

endif



ifneq ($(SUBARCH),$(ARCH))

  ifeq ($(CROSS_COMPILE),)

    CROSS_COMPILE := $(call cc-cross-prefix, $(UTS_MACHINE)-linux-  $(UTS_MACHINE)-linux-gnu-  $(UTS_MACHINE)-unknown-linux-gnu-)

  endif

endif



ifdef CONFIG_CPU_LITTLE_ENDIAN

ld-bfd			:= elf32-$(UTS_MACHINE)-linux

LDFLAGS_vmlinux		+= --defsym 'jiffies=jiffies_64' --oformat $(ld-bfd)

LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64 --oformat $(ld-bfd)

LDFLAGS			+= -EL

else

ld-bfd			:= elf32-$(UTS_MACHINE)big-linux

LDFLAGS_vmlinux		+= --defsym 'jiffies=jiffies_64+4' --oformat $(ld-bfd)

LDFLAGS_vmlinux		+= --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd)

LDFLAGS			+= -EB

endif

arch/sh/include/asm/Kbuild

+34 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



generic-y += bitsperlong.h

generic-y += cputime.h

generic-y += current.h

generic-y += delay.h

generic-y += div64.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += fcntl.h

generic-y += ioctl.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += kvm_para.h

generic-y += local.h

generic-y += local64.h

generic-y += param.h

generic-y += parport.h

generic-y += percpu.h

generic-y += poll.h

generic-y += mman.h

generic-y += msgbuf.h

generic-y += resource.h

generic-y += scatterlist.h

generic-y += sembuf.h

generic-y += serial.h

generic-y += shmbuf.h

generic-y += siginfo.h

generic-y += sizes.h

generic-y += socket.h

generic-y += statfs.h

generic-y += termbits.h

generic-y += termios.h

generic-y += ucontext.h

generic-y += xor.h



header-y += cachectl.h

header-y += cpu-features.h

header-y += hw_breakpoint.h

arch/sh/include/asm/bitsperlong.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/bitsperlong.h>

arch/sh/include/asm/cputime.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __SH_CPUTIME_H

#define __SH_CPUTIME_H



#include <asm-generic/cputime.h>



#endif /* __SH_CPUTIME_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE