diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-04 09:15:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-04 09:15:51 -0700 |
| commit | 4ded383569d6316d68d2aed298f8eb8d7bca37af (patch) | |
| tree | 87849300140f7a1c4d4efc78760156826cb28557 /include | |
| parent | e97dcb0eadbb821eccd549d4987b653cf61e2374 (diff) | |
| parent | 870568b39064cab2dd971fe57969916036982862 (diff) | |
| download | blackbird-obmc-linux-4ded383569d6316d68d2aed298f8eb8d7bca37af.tar.gz blackbird-obmc-linux-4ded383569d6316d68d2aed298f8eb8d7bca37af.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
x86, fpu: fix CONFIG_PREEMPT=y corruption of application's FPU stack
suspend-vs-iommu: prevent suspend if we could not resume
x86: section mismatch fix
x86: fix Xorg crash with xf86MapVidMem error
x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
x86: fix bad pmd ffff810000207xxx(9090909090909090)
x86: ioremap fix failing nesting check
x86: fix broken math-emu with lazy allocation of fpu area
x86: enable preemption in delay
x86: disable preemption in native_smp_prepare_cpus
x86: fix APIC warning on 32bit v2
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/i387.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/i387.h b/include/asm-x86/i387.h index 6b722d315936..37672f79dcc8 100644 --- a/include/asm-x86/i387.h +++ b/include/asm-x86/i387.h @@ -193,6 +193,8 @@ static inline int restore_i387(struct _fpstate __user *buf) #else /* CONFIG_X86_32 */ +extern void finit(void); + static inline void tolerant_fwait(void) { asm volatile("fnclex ; fwait"); |
