git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
process_64.c
diff --git
a/arch/x86/kernel/process_64.c
b/arch/x86/kernel/process_64.c
index
17cb329
..
3c2422a
100644
(file)
--- a/
arch/x86/kernel/process_64.c
+++ b/
arch/x86/kernel/process_64.c
@@
-49,7
+49,6
@@
#include <asm/ia32.h>
#include <asm/idle.h>
#include <asm/syscalls.h>
#include <asm/ia32.h>
#include <asm/idle.h>
#include <asm/syscalls.h>
-#include <asm/ds.h>
#include <asm/debugreg.h>
asmlinkage extern void ret_from_fork(void);
#include <asm/debugreg.h>
asmlinkage extern void ret_from_fork(void);
@@
-313,13
+312,6
@@
int copy_thread(unsigned long clone_flags, unsigned long sp,
if (err)
goto out;
}
if (err)
goto out;
}
-
- clear_tsk_thread_flag(p, TIF_DS_AREA_MSR);
- p->thread.ds_ctx = NULL;
-
- clear_tsk_thread_flag(p, TIF_DEBUGCTLMSR);
- p->thread.debugctlmsr = 0;
-
err = 0;
out:
if (err && p->thread.io_bitmap_ptr) {
err = 0;
out:
if (err && p->thread.io_bitmap_ptr) {
@@
-396,7
+388,7
@@
__switch_to(struct task_struct *prev_p, struct task_struct *next_p)
/* we're going to use this soon, after a few expensive things */
if (preload_fpu)
/* we're going to use this soon, after a few expensive things */
if (preload_fpu)
- prefetch(next->
x
state);
+ prefetch(next->
fpu.
state);
/*
* Reload esp0, LDT and the page table pointer:
/*
* Reload esp0, LDT and the page table pointer: