aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorMarkus Metzger <markus.t.metzger@intel.com>2009-04-03 10:43:46 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-07 07:36:28 -0400
commit2311f0de21c17b2a8b960677a9cccfbfa52beb35 (patch)
treebd1f12da337e4f88675f43e71fe6e06016fbc76c /arch/x86/include/asm
parent3a68eef945b234f286406d96dc690fe17863c203 (diff)
x86, ds: add leakage warning
Add a warning in case a debug store context is not removed before the task it is attached to is freed. Remove the old warning at thread exit. It is too early. Declare the debug store context field in thread_struct unconditionally. Remove ds_copy_thread() and ds_exit_thread() and do the work directly in process*.c. Signed-off-by: Markus Metzger <markus.t.metzger@intel.com> Cc: roland@redhat.com Cc: eranian@googlemail.com Cc: oleg@redhat.com Cc: juan.villacis@intel.com Cc: ak@linux.jf.intel.com LKML-Reference: <20090403144601.254472000@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/ds.h9
-rw-r--r--arch/x86/include/asm/processor.h4
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/x86/include/asm/ds.h b/arch/x86/include/asm/ds.h
index 413e127e567..149e5208e96 100644
--- a/arch/x86/include/asm/ds.h
+++ b/arch/x86/include/asm/ds.h
@@ -285,21 +285,12 @@ extern void __cpuinit ds_init_intel(struct cpuinfo_x86 *);
285 */ 285 */
286extern void ds_switch_to(struct task_struct *prev, struct task_struct *next); 286extern void ds_switch_to(struct task_struct *prev, struct task_struct *next);
287 287
288/*
289 * Task clone/init and cleanup work
290 */
291extern void ds_copy_thread(struct task_struct *tsk, struct task_struct *father);
292extern void ds_exit_thread(struct task_struct *tsk);
293
294#else /* CONFIG_X86_DS */ 288#else /* CONFIG_X86_DS */
295 289
296struct cpuinfo_x86; 290struct cpuinfo_x86;
297static inline void __cpuinit ds_init_intel(struct cpuinfo_x86 *ignored) {} 291static inline void __cpuinit ds_init_intel(struct cpuinfo_x86 *ignored) {}
298static inline void ds_switch_to(struct task_struct *prev, 292static inline void ds_switch_to(struct task_struct *prev,
299 struct task_struct *next) {} 293 struct task_struct *next) {}
300static inline void ds_copy_thread(struct task_struct *tsk,
301 struct task_struct *father) {}
302static inline void ds_exit_thread(struct task_struct *tsk) {}
303 294
304#endif /* CONFIG_X86_DS */ 295#endif /* CONFIG_X86_DS */
305#endif /* _ASM_X86_DS_H */ 296#endif /* _ASM_X86_DS_H */
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 1efeb497f1f..7c39de7e709 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -454,10 +454,8 @@ struct thread_struct {
454 unsigned io_bitmap_max; 454 unsigned io_bitmap_max;
455/* MSR_IA32_DEBUGCTLMSR value to switch in if TIF_DEBUGCTLMSR is set. */ 455/* MSR_IA32_DEBUGCTLMSR value to switch in if TIF_DEBUGCTLMSR is set. */
456 unsigned long debugctlmsr; 456 unsigned long debugctlmsr;
457#ifdef CONFIG_X86_DS 457 /* Debug Store context; see asm/ds.h */
458/* Debug Store context; see include/asm-x86/ds.h; goes into MSR_IA32_DS_AREA */
459 struct ds_context *ds_ctx; 458 struct ds_context *ds_ctx;
460#endif /* CONFIG_X86_DS */
461}; 459};
462 460
463static inline unsigned long native_get_debugreg(int regno) 461static inline unsigned long native_get_debugreg(int regno)