diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 09:33:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 09:33:15 +0200 |
| commit | 134cbf35c739bf89c51fd975a33a6b87507482c4 (patch) | |
| tree | c30536dcbb6e99a0f204879bbe5a19bfb27cccf8 /arch/sh/kernel/cpu/sh5/entry.S | |
| parent | 2feceeff1e771850e49f9074307f071964fd9e3e (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
| download | op-kernel-dev-134cbf35c739bf89c51fd975a33a6b87507482c4.zip op-kernel-dev-134cbf35c739bf89c51fd975a33a6b87507482c4.tar.gz | |
Merge commit 'v2.6.30-rc5' into x86/mm
Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/kernel/cpu/sh5/entry.S')
| -rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index e640c63..7e49cb8 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S @@ -10,6 +10,7 @@ * for more details. */ #include <linux/errno.h> +#include <linux/init.h> #include <linux/sys.h> #include <cpu/registers.h> #include <asm/processor.h> @@ -2058,10 +2059,10 @@ asm_uaccess_end: /* - * --- .text.init Section + * --- .init.text Section */ - .section .text.init, "ax" + __INIT /* * void trap_init (void) |
