Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/ppc64/kernel/align.c b/arch/ppc64/kernel/align.c
index 330e7ef81427..256d5b592aa1 100644
--- a/arch/ppc64/kernel/align.c
+++ b/arch/ppc64/kernel/align.c
@@ -313,7 +313,7 @@ fix_alignment(struct pt_regs *regs)
                                 /* Doing stfs, have to convert to single */
                                 preempt_disable();
                                 enable_kernel_fp();
-                                cvt_df(&current->thread.fpr[reg], (float *)&data.v[4], &current->thread.fpscr);
+                                cvt_df(&current->thread.fpr[reg], (float *)&data.v[4], &current->thread);
                                 disable_kernel_fp();
                                 preempt_enable();
                         }
@@ -349,7 +349,7 @@ fix_alignment(struct pt_regs *regs)
                                 /* Doing lfs, have to convert to double */
                                 preempt_disable();
                                 enable_kernel_fp();
-                                cvt_fd((float *)&data.v[4], &current->thread.fpr[reg], &current->thread.fpscr);
+                                cvt_fd((float *)&data.v[4], &current->thread.fpr[reg], &current->thread);
                                 disable_kernel_fp();
                                 preempt_enable();
                         }