diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/x86/power/cpu.c | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/power/cpu.c')
| -rw-r--r-- | arch/x86/power/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index f10c0afa1cb4..4889655ba784 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <asm/xcr.h> | 20 | #include <asm/xcr.h> |
| 21 | #include <asm/suspend.h> | 21 | #include <asm/suspend.h> |
| 22 | #include <asm/debugreg.h> | 22 | #include <asm/debugreg.h> |
| 23 | #include <asm/fpu-internal.h> /* pcntxt_mask */ | ||
| 23 | 24 | ||
| 24 | #ifdef CONFIG_X86_32 | 25 | #ifdef CONFIG_X86_32 |
| 25 | static struct saved_context saved_context; | 26 | static struct saved_context saved_context; |