Re-add a warning that had been removed with an earlier patch.
Patch 3 does bts cleanup earlier, so the warning makes sense, again.
Move the warning from exit to release.
Signed-off-by: Markus Metzger <[email protected]>
---
Index: git-tip/arch/x86/kernel/ds.c
===================================================================
--- git-tip.orig/arch/x86/kernel/ds.c 2009-03-27 08:04:39.000000000 +0100
+++ git-tip/arch/x86/kernel/ds.c 2009-03-27 08:04:53.000000000 +0100
@@ -1309,10 +1309,6 @@ void ds_copy_thread(struct task_struct *
tsk->thread.ds_ctx = NULL;
}
-void ds_exit_thread(struct task_struct *tsk)
-{
-}
-
static __init int ds_selftest(void)
{
if (ds_cfg.sizeof_rec[ds_bts]) {
Index: git-tip/arch/x86/include/asm/ds.h
===================================================================
--- git-tip.orig/arch/x86/include/asm/ds.h 2009-03-27 08:01:13.000000000 +0100
+++ git-tip/arch/x86/include/asm/ds.h 2009-03-27 08:04:53.000000000 +0100
@@ -292,7 +292,6 @@ extern void ds_switch_to(struct task_str
* Task clone/init and cleanup work
*/
extern void ds_copy_thread(struct task_struct *tsk, struct task_struct *father);
-extern void ds_exit_thread(struct task_struct *tsk);
#else /* CONFIG_X86_DS */
@@ -302,7 +301,6 @@ static inline void ds_switch_to(struct t
struct task_struct *next) {}
static inline void ds_copy_thread(struct task_struct *tsk,
struct task_struct *father) {}
-static inline void ds_exit_thread(struct task_struct *tsk) {}
#endif /* CONFIG_X86_DS */
#endif /* _ASM_X86_DS_H */
Index: git-tip/arch/x86/kernel/process.c
===================================================================
--- git-tip.orig/arch/x86/kernel/process.c 2009-03-27 07:59:21.000000000 +0100
+++ git-tip/arch/x86/kernel/process.c 2009-03-27 08:04:53.000000000 +0100
@@ -82,8 +82,6 @@ void exit_thread(void)
t->io_bitmap_max = 0;
put_cpu();
}
-
- ds_exit_thread(current);
}
void flush_thread(void)
Index: git-tip/arch/x86/kernel/process_32.c
===================================================================
--- git-tip.orig/arch/x86/kernel/process_32.c 2009-03-27 07:59:21.000000000 +0100
+++ git-tip/arch/x86/kernel/process_32.c 2009-03-27 08:04:53.000000000 +0100
@@ -234,6 +234,8 @@ void release_thread(struct task_struct *
{
BUG_ON(dead_task->mm);
release_vm86_irqs(dead_task);
+
+ WARN(dead_task->thread.ds_ctx, "leaking DS context\n");
}
/*
Index: git-tip/arch/x86/kernel/process_64.c
===================================================================
--- git-tip.orig/arch/x86/kernel/process_64.c 2009-03-27 07:59:21.000000000 +0100
+++ git-tip/arch/x86/kernel/process_64.c 2009-03-27 08:04:53.000000000 +0100
@@ -248,6 +248,8 @@ void release_thread(struct task_struct *
BUG();
}
}
+
+ WARN(dead_task->thread.ds_ctx, "leaking DS context\n");
}
static inline void set_32bit_tls(struct task_struct *t, int tls, u32 addr)
---------------------------------------------------------------------
Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen Germany
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer
Registergericht: Muenchen HRB 47456 Ust.-IdNr.
VAT Registration No.: DE129385895
Citibank Frankfurt (BLZ 502 109 00) 600119052
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.