1 files changed, 9 insertions, 9 deletions

diff --git a/arch/mips/include/asm/cop2.h b/arch/mips/include/asm/cop2.h
index d0352983b94d..51f80bd36fcc 100644
--- a/arch/mips/include/asm/cop2.h
+++ b/arch/mips/include/asm/cop2.h
@@ -16,8 +16,8 @@
 extern void octeon_cop2_save(struct octeon_cop2_state *);
 extern void octeon_cop2_restore(struct octeon_cop2_state *);
 
-#define cop2_save(r)            octeon_cop2_save(r)
-#define cop2_restore(r)         octeon_cop2_restore(r)
+#define cop2_save(r)            octeon_cop2_save(&(r)->thread.cp2)
+#define cop2_restore(r)         octeon_cop2_restore(&(r)->thread.cp2)
 
 #define cop2_present            1
 #define cop2_lazy_restore       1
@@ -26,26 +26,26 @@ extern void octeon_cop2_restore(struct octeon_cop2_state *);
 
 extern void nlm_cop2_save(struct nlm_cop2_state *);
 extern void nlm_cop2_restore(struct nlm_cop2_state *);
-#define cop2_save(r)            nlm_cop2_save(r)
-#define cop2_restore(r)         nlm_cop2_restore(r)
+
+#define cop2_save(r)            nlm_cop2_save(&(r)->thread.cp2)
+#define cop2_restore(r)         nlm_cop2_restore(&(r)->thread.cp2)
 
 #define cop2_present            1
 #define cop2_lazy_restore       0
 
 #elif defined(CONFIG_CPU_LOONGSON3)
 
-#define cop2_save(r)
-#define cop2_restore(r)
-
 #define cop2_present            1
 #define cop2_lazy_restore       1
+#define cop2_save(r)            do { (r); } while (0)
+#define cop2_restore(r)         do { (r); } while (0)
 
 #else
 
 #define cop2_present            0
 #define cop2_lazy_restore       0
-#define cop2_save(r)
-#define cop2_restore(r)
+#define cop2_save(r)            do { (r); } while (0)
+#define cop2_restore(r)         do { (r); } while (0)
 #endif
 
 enum cu2_ops {