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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[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
a5d7e16
..
1d58c13
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)
{
@@
-83,11
+82,8
@@
int save_i387(struct _fpstate __user *buf)
struct task_struct *tsk = current;
int err = 0;
struct task_struct *tsk = current;
int err = 0;
- {
- extern void bad_user_i387_struct(void);
- if (sizeof(struct user_i387_struct) != sizeof(tsk->thread.i387.fxsave))
- bad_user_i387_struct();
- }
+ BUILD_BUG_ON(sizeof(struct user_i387_struct) !=
+ sizeof(tsk->thread.i387.fxsave));
if ((unsigned long)buf % 16)
printk("save_i387: bad fpstate %p\n",buf);
if ((unsigned long)buf % 16)
printk("save_i387: bad fpstate %p\n",buf);