diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 11:56:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 11:56:57 -0400 |
| commit | bbad5d4750ab3b44a196f9bdd982972e41b7e520 (patch) | |
| tree | 357c30909ea7311daacc7e5e9e79c6d91a857d00 /arch/x86/kernel/i387.c | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
| parent | 11dbc963a8f6128595d0f6ecf138dc369e144997 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ptrace GET/SET FPXREGS broken
x86: fix cpu hotplug crash
x86: section/warning fixes
x86: shift bits the right way in native_read_tscp
Diffstat (limited to 'arch/x86/kernel/i387.c')
| -rw-r--r-- | arch/x86/kernel/i387.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index eb9ddd8efb82..95e80e5033c3 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c | |||
| @@ -162,7 +162,7 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset, | |||
| 162 | int ret; | 162 | int ret; |
| 163 | 163 | ||
| 164 | if (!cpu_has_fxsr) | 164 | if (!cpu_has_fxsr) |
| 165 | return -ENODEV; | 165 | return -EIO; |
| 166 | 166 | ||
| 167 | ret = init_fpu(target); | 167 | ret = init_fpu(target); |
| 168 | if (ret) | 168 | if (ret) |
| @@ -179,7 +179,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset, | |||
| 179 | int ret; | 179 | int ret; |
| 180 | 180 | ||
| 181 | if (!cpu_has_fxsr) | 181 | if (!cpu_has_fxsr) |
| 182 | return -ENODEV; | 182 | return -EIO; |
| 183 | 183 | ||
| 184 | ret = init_fpu(target); | 184 | ret = init_fpu(target); |
| 185 | if (ret) | 185 | if (ret) |