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

Commit 5983b125 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: support older gcc's
  sh: trivial build cleanups.
  sh: Fix vsyscall build failure.
  sh: Trivial fix for dma-api compile failure.
  sh: Fix pcrel too far for in_nmi label.
  sh: section mismatch fixes for system timer.
parents 8ac1c101 4e1c2084

arch/sh/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ cflags-$(CONFIG_CPU_SH2A) := -m2a $(call cc-option,-m2a-nofpu,) 
cflags-$(CONFIG_CPU_SH3)		:= -m3

cflags-$(CONFIG_CPU_SH4)		:= -m4 \

	$(call cc-option,-mno-implicit-fp,-m4-nofpu)

cflags-$(CONFIG_CPU_SH4A)		:= -m4a $(call cc-option,-m4a-nofpu,)

cflags-$(CONFIG_CPU_SH4A)		:= $(call cc-option,-m4a,) $(call cc-option,-m4a-nofpu,)



cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= -mb

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -ml

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

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

#include <linux/platform_device.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <asm/dma.h>



DEFINE_SPINLOCK(dma_spin_lock);

arch/sh/kernel/cf-enabler.c

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

#include <linux/mm.h>

#include <linux/vmalloc.h>

#include <linux/interrupt.h>

#include <asm/io.h>

#include <asm/irq.h>
@@ -149,6 +150,11 @@ static int __init cf_init_se(void) 
	ctrl_outb(0x42, PA_MRSHPC_MW2 + 0x200);

	return 0;

}

#else

static int __init cf_init_se(void)

{

	return -1;

}

#endif



int __init cf_init(void)

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

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ skip_restore: 


	.align	2

5:	.long	0x00001000	! DSP

6:	.long	in_nmi

7:	.long	0x30000000



! common exception handler

arch/sh/kernel/cpu/sh4/probe.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */

#include <linux/init.h>

#include <linux/io.h>

#include <linux/smp.h>

#include <asm/processor.h>

#include <asm/cache.h>