diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-25 10:58:34 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-25 10:58:34 -0400 |
| commit | 4cafc4b8d7219b70e15f22e4a51b3ce847810caf (patch) | |
| tree | 8051ea3f36f0682d08f47df8e35e14ca7eb7a5d7 /arch/x86/kernel/process_64.c | |
| parent | b47fad3bfb5940cc3e28a1c69716f6dc44e4b7e6 (diff) | |
| parent | dbd1e66e04558a582e673bc4a9cd933ce0228d93 (diff) | |
Merge branch 'oprofile/core' into oprofile/x86
Conflicts:
arch/x86/oprofile/op_model_amd.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/kernel/process_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 3d9ea531ddd1..b3d7a3a04f38 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -424,7 +424,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | |||
| 424 | load_TLS(next, cpu); | 424 | load_TLS(next, cpu); |
| 425 | 425 | ||
| 426 | /* Must be after DS reload */ | 426 | /* Must be after DS reload */ |
| 427 | unlazy_fpu(prev_p); | 427 | __unlazy_fpu(prev_p); |
| 428 | 428 | ||
| 429 | /* Make sure cpu is ready for new context */ | 429 | /* Make sure cpu is ready for new context */ |
| 430 | if (preload_fpu) | 430 | if (preload_fpu) |