summaryrefslogtreecommitdiff
path: root/arch/sh/kernel/process.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-08-21 14:44:54 +0200
committerThomas Gleixner <tglx@linutronix.de>2013-08-21 14:44:54 +0200
commitfac778a2b8d6ca953d440baeee72901c2dd5aad9 (patch)
treec43d780b5ff8819f4353b16c99601c5ceeeacad7 /arch/sh/kernel/process.c
parent07862c1cd6675cde2dd4bd64e64d704ea2185b79 (diff)
parent94fc5d9de5bd757ad46f0d94bc4ebf617c4487f6 (diff)
Merge branch 'linus' into timers/core
Reason: Get upstream changes on which new patches depend on. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/sh/kernel/process.c')
-rw-r--r--arch/sh/kernel/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 055d91b70305..53bc6c4c84ec 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -65,7 +65,7 @@ void arch_task_cache_init(void)
# define HAVE_SOFTFP 0
#endif
-void __cpuinit init_thread_xstate(void)
+void init_thread_xstate(void)
{
if (boot_cpu_data.flags & CPU_HAS_FPU)
xstate_size = sizeof(struct sh_fpu_hard_struct);