diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /arch/i386/boot/cpucheck.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/i386/boot/cpucheck.c')
| -rw-r--r-- | arch/i386/boot/cpucheck.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/boot/cpucheck.c b/arch/i386/boot/cpucheck.c index 991e8ceae1de..e655a89c5510 100644 --- a/arch/i386/boot/cpucheck.c +++ b/arch/i386/boot/cpucheck.c | |||
| @@ -96,7 +96,8 @@ static int has_fpu(void) | |||
| 96 | asm volatile("movl %0,%%cr0" : : "r" (cr0)); | 96 | asm volatile("movl %0,%%cr0" : : "r" (cr0)); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | asm("fninit ; fnstsw %0 ; fnstcw %1" : "+m" (fsw), "+m" (fcw)); | 99 | asm volatile("fninit ; fnstsw %0 ; fnstcw %1" |
| 100 | : "+m" (fsw), "+m" (fcw)); | ||
| 100 | 101 | ||
| 101 | return fsw == 0 && (fcw & 0x103f) == 0x003f; | 102 | return fsw == 0 && (fcw & 0x103f) == 0x003f; |
| 102 | } | 103 | } |