Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (50 commits)
  [MIPS] Add smp_call_function_single()
  [MIPS] thread_info.h: kmalloc + memset conversion to kzalloc
  [MIPS] Kexec: Fix several 64-bit bugs.
  [MIPS] Kexec: Fix several warnings.
  [MIPS] DDB5477: Remove support
  [MIPS] Fulong: Remove unneeded header file
  [MIPS] Cobalt: Enable UART on RaQ1
  [MIPS] Remove unused GROUP_TOSHIBA_NAMES
  [MIPS] remove some duplicate includes
  [MIPS] Oprofile: Fix rm9000 performance counter handler
  [MIPS] Use -Werror on subdirectories which build cleanly.
  [MIPS] Yosemite: Fix warning.
  [MIPS] PMON: Fix cpustart declaration.
  [MIPS] Yosemite: Only build ll_ht_smp_irq_handler() if HYPERTRANSPORT.
  [MIPS] Yosemite: Fix build error due to undeclared titan_mailbox_irq().
  [MIPS] Yosemite: Don't declare titan_mailbox_irq() as asmlinkage.
  [MIPS] Yosemite: Fix warnings in i2c-yoesmite by deleting the unused code.
  [MIPS] Delete unused arch/mips/gt64120/common/
  [MIPS] Fix build warning in unaligned load/store emulator.
  [MIPS] IP32: Don't ignore request_irq's return value.
  ...

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c
index ede5d73d652e..892665bb12b1 100644
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
@@ -50,6 +50,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
         cpumask_t effective_mask;
         int retval;
         struct task_struct *p;
+        struct thread_info *ti;
 
         if (len < sizeof(new_mask))
                 return -EINVAL;
@@ -93,16 +94,16 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
         read_unlock(&tasklist_lock);
 
         /* Compute new global allowed CPU set if necessary */
-        if ((p->thread.mflags & MF_FPUBOUND)
-        && cpus_intersects(new_mask, mt_fpu_cpumask)) {
+        ti = task_thread_info(p);
+        if (test_ti_thread_flag(ti, TIF_FPUBOUND) &&
+            cpus_intersects(new_mask, mt_fpu_cpumask)) {
                 cpus_and(effective_mask, new_mask, mt_fpu_cpumask);
                 retval = set_cpus_allowed(p, effective_mask);
         } else {
-                p->thread.mflags &= ~MF_FPUBOUND;
+                clear_ti_thread_flag(ti, TIF_FPUBOUND);
                 retval = set_cpus_allowed(p, new_mask);
         }
 
-
 out_unlock:
         put_task_struct(p);
         unlock_cpu_hotplug();