diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 09:15:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 09:15:42 -0700 |
commit | 5983b125740553d08a67d0c57e8c1021f5a06e31 (patch) | |
tree | 7c8cb1427ea5ca8260b4ee6689c947c62fa3bbcf /arch | |
parent | 8ac1c101ec73e60635257ed9af1c6ab423c535b4 (diff) | |
parent | 4e1c20842044da32f771631049b7082dad63a9c5 (diff) |
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.
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/Makefile | 2 | ||||
-rw-r--r-- | arch/sh/drivers/dma/dma-api.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cf-enabler.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/probe.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/timers/timer.c | 5 | ||||
-rw-r--r-- | arch/sh/kernel/vsyscall/vsyscall.c | 1 |
8 files changed, 15 insertions, 4 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 7b112241705..883b03b040c 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile @@ -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 diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c index 8057a27a1bc..cf8e1199433 100644 --- a/arch/sh/drivers/dma/dma-api.c +++ b/arch/sh/drivers/dma/dma-api.c @@ -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); diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c index 849a9e19139..ebc73b85094 100644 --- a/arch/sh/kernel/cf-enabler.c +++ b/arch/sh/kernel/cf-enabler.c @@ -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) diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 832c0b4a1e6..659cc081e5e 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S @@ -320,6 +320,7 @@ skip_restore: .align 2 5: .long 0x00001000 ! DSP +6: .long in_nmi 7: .long 0x30000000 ! common exception handler diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c index 8cd04904c77..fab2eb07196 100644 --- a/arch/sh/kernel/cpu/sh4/probe.c +++ b/arch/sh/kernel/cpu/sh4/probe.c @@ -12,6 +12,7 @@ */ #include <linux/init.h> #include <linux/io.h> +#include <linux/smp.h> #include <asm/processor.h> #include <asm/cache.h> diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index dbebaddcfe3..283e1425ced 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c @@ -10,6 +10,8 @@ * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. */ + +#include <linux/err.h> #include <linux/cache.h> #include <linux/cpumask.h> #include <linux/delay.h> diff --git a/arch/sh/kernel/timers/timer.c b/arch/sh/kernel/timers/timer.c index a6bcc913d25..4e7e747d1b6 100644 --- a/arch/sh/kernel/timers/timer.c +++ b/arch/sh/kernel/timers/timer.c @@ -13,7 +13,7 @@ #include <linux/string.h> #include <asm/timer.h> -static struct sys_timer *sys_timers[] __initdata = { +static struct sys_timer *sys_timers[] = { #ifdef CONFIG_SH_TMU &tmu_timer, #endif @@ -26,7 +26,7 @@ static struct sys_timer *sys_timers[] __initdata = { NULL, }; -static char timer_override[10] __initdata; +static char timer_override[10]; static int __init timer_setup(char *str) { if (str) @@ -53,4 +53,3 @@ struct sys_timer *get_sys_timer(void) return NULL; } - diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c index e146bafcd14..2aa9438361b 100644 --- a/arch/sh/kernel/vsyscall/vsyscall.c +++ b/arch/sh/kernel/vsyscall/vsyscall.c @@ -17,6 +17,7 @@ #include <linux/gfp.h> #include <linux/module.h> #include <linux/elf.h> +#include <linux/sched.h> /* * Should the kernel map a VDSO page into processes and pass its |