Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / include / asm-x86 / i387.h

diff --git a/include/asm-x86/i387.h b/include/asm-x86/i387.h
index 382a5fa9d492a1715f1c2b378139d6ad32c46951..da2adb45f6e3949476ac0a4d2c1aa1cbb2024986 100644 (file)
--- a/include/asm-x86/i387.h
+++ b/include/asm-x86/i387.h
@@ -21,7 +21,7 @@
 
 extern void fpu_init(void);
 extern void mxcsr_feature_mask_init(void);
-extern void init_fpu(struct task_struct *child);
+extern int init_fpu(struct task_struct *child);
 extern asmlinkage void math_state_restore(void);
 extern void init_thread_xstate(void);
 
@@ -328,7 +328,7 @@ static inline unsigned short get_fpu_cwd(struct task_struct *tsk)
        if (cpu_has_fxsr) {
                return tsk->thread.xstate->fxsave.cwd;
        } else {
-               return (unsigned short) tsk->thread.xstate->fsave.cwd;
+               return (unsigned short)tsk->thread.xstate->fsave.cwd;
        }
 }
 
@@ -337,7 +337,7 @@ static inline unsigned short get_fpu_swd(struct task_struct *tsk)
        if (cpu_has_fxsr) {
                return tsk->thread.xstate->fxsave.swd;
        } else {
-               return (unsigned short) tsk->thread.xstate->fsave.swd;
+               return (unsigned short)tsk->thread.xstate->fsave.swd;
        }
 }