diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:22:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:22:34 +0200 |
commit | 6a991acceedce3ca93caef8ba7af2468c9451614 (patch) | |
tree | 1997d71fc57bdebd12fc70a73070281614b52f15 /arch/sh/kernel/process.c | |
parent | x86: Save cr2 in NMI in case NMIs take a page fault (for i386) (diff) | |
parent | Linux 3.5-rc3 (diff) | |
download | linux-6a991acceedce3ca93caef8ba7af2468c9451614.tar.xz linux-6a991acceedce3ca93caef8ba7af2468c9451614.zip |
Merge commit 'v3.5-rc3' into x86/debug
Merge it in to pick up a fix that we are going to clean up in this
branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/kernel/process.c')
-rw-r--r-- | arch/sh/kernel/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index 9b7a459a4613..055d91b70305 100644 --- a/arch/sh/kernel/process.c +++ b/arch/sh/kernel/process.c @@ -4,6 +4,7 @@ #include <linux/sched.h> #include <linux/export.h> #include <linux/stackprotector.h> +#include <asm/fpu.h> struct kmem_cache *task_xstate_cachep = NULL; unsigned int xstate_size; |