diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /include/asm-mips/fpu.h | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-mips/fpu.h')
| -rw-r--r-- | include/asm-mips/fpu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/fpu.h b/include/asm-mips/fpu.h index e59d4c039661..8a3ef247659a 100644 --- a/include/asm-mips/fpu.h +++ b/include/asm-mips/fpu.h | |||
| @@ -35,6 +35,8 @@ extern asmlinkage int (*save_fp_context32)(struct sigcontext32 __user *sc); | |||
| 35 | extern asmlinkage int (*restore_fp_context32)(struct sigcontext32 __user *sc); | 35 | extern asmlinkage int (*restore_fp_context32)(struct sigcontext32 __user *sc); |
| 36 | 36 | ||
| 37 | extern void fpu_emulator_init_fpu(void); | 37 | extern void fpu_emulator_init_fpu(void); |
| 38 | extern int fpu_emulator_save_context(struct sigcontext __user *sc); | ||
| 39 | extern int fpu_emulator_restore_context(struct sigcontext __user *sc); | ||
| 38 | extern void _init_fpu(void); | 40 | extern void _init_fpu(void); |
| 39 | extern void _save_fp(struct task_struct *); | 41 | extern void _save_fp(struct task_struct *); |
| 40 | extern void _restore_fp(struct task_struct *); | 42 | extern void _restore_fp(struct task_struct *); |