diff --git a/[refs] b/[refs] index eae0753b722f..5250d90c786a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd4124a8a06bca89c077a16437edac010f0bb993 +refs/heads/master: 9ca0791dcaa666e8e8f4b4ca028b65b4bde9cb28 diff --git a/trunk/arch/x86/kernel/ds.c b/trunk/arch/x86/kernel/ds.c index 169a120587be..de7cdbda1c36 100644 --- a/trunk/arch/x86/kernel/ds.c +++ b/trunk/arch/x86/kernel/ds.c @@ -1029,5 +1029,4 @@ void ds_copy_thread(struct task_struct *tsk, struct task_struct *father) void ds_exit_thread(struct task_struct *tsk) { - WARN_ON(tsk->thread.ds_ctx); }