Commit 2c787198 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
  sh: Use relative paths for mach/cpu symlinks.
  SH: Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro.
  sh: Fix more user header breakage from sh64 integration.
  sh: Fix uImage build error.
  sh: Fix up the timer IRQ definition for SH7203.
  sh: Fix up the address error exception handler for SH-2.
  serial: sh-sci: Fix fifo stall on SH7760/SH7780/SH7785 SCIF.
parents 49ccf74a 49a5ba46

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ config SH_TIMER_IRQ 
			CPU_SUBTYPE_SH7763

	default "86" if CPU_SUBTYPE_SH7619

	default "140" if CPU_SUBTYPE_SH7206

	default "142" if CPU_SUBTYPE_SH7203

	default "16"



config SH_PCLK_FREQ

arch/sh/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -154,7 +154,11 @@ drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/ 


boot := arch/sh/boot



ifneq ($(KBUILD_SRC),)

incdir-prefix	:= $(srctree)/include/asm-sh/

else

incdir-prefix	:=

endif



#	Update machine arch and proc symlinks if something which affects

#	them changed.  We use .arch and .mach to indicate when they were
@@ -182,7 +186,7 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \ 
	$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi

	$(Q)rm -f include/asm-sh/mach

	$(Q)for i in $(incdir-y); do \

	if [ -d $(incdir-prefix)$$i ]; then \

	if [ -d $(srctree)/include/asm-sh/$$i ]; then \

		echo -n '  SYMLINK include/asm-sh/mach -> '; \

		echo -e "include/asm-sh/$$i"; \

		ln -fsn $(incdir-prefix)$$i \
@@ -191,7 +195,7 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \ 
		if [ ! -d include/asm-sh/mach ]; then \

			echo -n '  SYMLINK include/asm-sh/mach -> '; \

			echo -e 'include/asm-sh'; \

			ln -fsn $(incdir-prefix) include/asm-sh/mach; \

			ln -fsn $(incdir-prefix)../asm-sh include/asm-sh/mach; \

		fi; \

	fi; \

	done

arch/sh/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE 
$(obj)/compressed/vmlinux: FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@



KERNEL_LOAD	:= $(shell /bin/bash -c 'printf "0x%8x" \

KERNEL_LOAD	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)  + \

			$(CONFIG_MEMORY_START) + \

			$(CONFIG_ZERO_PAGE_OFFSET)]')



KERNEL_ENTRY	:= $(shell /bin/bash -c 'printf "0x%8x" \

KERNEL_ENTRY	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)  + \

			$(CONFIG_MEMORY_START) + \

			$(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')

arch/sh/kernel/cpu/sh2/entry.S

+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ ENTRY(sh_bios_handler) 


ENTRY(address_error_trap_handler)

	mov	r15,r4				! regs

	add	#4,r4

	mov	#OFF_PC,r0

	mov.l	@(r0,r15),r6			! pc

	mov.l	1f,r0

arch/sh/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ void smp_send_stop(void) 
}



struct smp_fn_call_struct smp_fn_call = {

	.lock		= SPIN_LOCK_UNLOCKED,

	.lock		= __SPIN_LOCK_UNLOCKED(smp_fn_call.lock),

	.finished	= ATOMIC_INIT(0),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE