Changeset 18579 for src/linux/universal/linux-3.2/arch/x86/kernel/process_64.c

Timestamp:

02/28/12 00:55:15 (15 months ago)

Author:

BrainSlayer

Message:

update to 3.2.8

File:

• src/linux/universal/linux-3.2/arch/x86/kernel/process_64.c (modified) (4 diffs)

src/linux/universal/linux-3.2/arch/x86/kernel/process_64.c

@@ -382 +382 @@
         struct tss_struct *tss = &per_cpu(init_tss, cpu);
         unsigned fsindex, gsindex;
-        bool preload_fpu;
-
-        /*
-         * If the task has used fpu the last 5 timeslices, just do a full
-         * restore of the math state immediately to avoid the trap; the
-         * chances of needing FPU soon are obviously high now
-         */
-        preload_fpu = tsk_used_math(next_p) && next_p->fpu_counter > 5;
-
-        /* we're going to use this soon, after a few expensive things */
-        if (preload_fpu)
-                prefetch(next->fpu.state);
+        fpu_switch_t fpu;
+
+        fpu = switch_fpu_prepare(prev_p, next_p);
 
         /*
@@ -422 +413 @@
 
         load_TLS(next, cpu);
-
-        /* Must be after DS reload */
-        __unlazy_fpu(prev_p);
-
-        /* Make sure cpu is ready for new context */
-        if (preload_fpu)
-                clts();
 
         /*
@@ -470 +454 @@
         prev->gsindex = gsindex;
 
+        switch_fpu_finish(next_p, fpu);
+
         /*
          * Switch the PDA and FPU contexts.
@@ -487 +473 @@
                      task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV))
                 __switch_to_xtra(prev_p, next_p, tss);
-
-        /*
-         * Preload the FPU context, now that we've determined that the
-         * task is likely to be using it. 
-         */
-        if (preload_fpu)
-                __math_state_restore();
 
         return prev_p;