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_64.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-dev-6a991acceedce3ca93caef8ba7af2468c9451614.tar.xz linux-dev-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_64.c')
| -rw-r--r-- | arch/sh/kernel/process_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index 4264583eabac..602545b12a86 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c @@ -33,6 +33,7 @@ #include <asm/switch_to.h> struct task_struct *last_task_used_math = NULL; +struct pt_regs fake_swapper_regs = { 0, }; void show_regs(struct pt_regs *regs) { |