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 'egalax' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
process_32.c
diff --git
a/arch/x86/kernel/process_32.c
b/arch/x86/kernel/process_32.c
index
f6c6266
..
8d12878
100644
(file)
--- a/
arch/x86/kernel/process_32.c
+++ b/
arch/x86/kernel/process_32.c
@@
-55,7
+55,6
@@
#include <asm/cpu.h>
#include <asm/idle.h>
#include <asm/syscalls.h>
#include <asm/cpu.h>
#include <asm/idle.h>
#include <asm/syscalls.h>
-#include <asm/ds.h>
#include <asm/debugreg.h>
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
#include <asm/debugreg.h>
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
@@
-238,13
+237,6
@@
int copy_thread(unsigned long clone_flags, unsigned long sp,
kfree(p->thread.io_bitmap_ptr);
p->thread.io_bitmap_max = 0;
}
kfree(p->thread.io_bitmap_ptr);
p->thread.io_bitmap_max = 0;
}
-
- 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;
-
return err;
}
return err;
}
@@
-317,7
+309,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.
/*
* Reload esp0.