git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
i387.c
diff --git
a/arch/x86_64/kernel/i387.c
b/arch/x86_64/kernel/i387.c
index
ba139ca
..
3aa1e9b
100644
(file)
--- a/
arch/x86_64/kernel/i387.c
+++ b/
arch/x86_64/kernel/i387.c
@@
-14,7
+14,6
@@
* the 64bit user space sees a FXSAVE frame directly.
*/
* the 64bit user space sees a FXSAVE frame directly.
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <asm/processor.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <asm/processor.h>
@@
-24,7
+23,7
@@
#include <asm/ptrace.h>
#include <asm/uaccess.h>
#include <asm/ptrace.h>
#include <asm/uaccess.h>
-unsigned int mxcsr_feature_mask = 0xffffffff;
+unsigned int mxcsr_feature_mask
__read_mostly
= 0xffffffff;
void mxcsr_feature_mask_init(void)
{
void mxcsr_feature_mask_init(void)
{
@@
-42,7
+41,7
@@
void mxcsr_feature_mask_init(void)
* Called at bootup to set up the initial FPU state that is later cloned
* into all processes.
*/
* Called at bootup to set up the initial FPU state that is later cloned
* into all processes.
*/
-void __init fpu_init(void)
+void __
cpu
init fpu_init(void)
{
unsigned long oldcr0 = read_cr0();
extern void __bad_fxsave_alignment(void);
{
unsigned long oldcr0 = read_cr0();
extern void __bad_fxsave_alignment(void);
@@
-95,7
+94,7
@@
int save_i387(struct _fpstate __user *buf)
if (!used_math())
return 0;
clear_used_math(); /* trigger finit */
if (!used_math())
return 0;
clear_used_math(); /* trigger finit */
- if (t
sk->thread_info
->status & TS_USEDFPU) {
+ if (t
ask_thread_info(tsk)
->status & TS_USEDFPU) {
err = save_i387_checking((struct i387_fxsave_struct __user *)buf);
if (err) return err;
stts();
err = save_i387_checking((struct i387_fxsave_struct __user *)buf);
if (err) return err;
stts();