Skip to content

Commit

Permalink
[PATCH] x86_64: eliminate set_debug()
Browse files Browse the repository at this point in the history
For consistency and to have only a single place of definition, replace
set_debug() uses with set_debugreg(), and eliminate the definition of
thj former.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jan Beulich authored and Linus Torvalds committed Mar 25, 2006
1 parent 893efca commit 2b514e7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion arch/x86_64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long rsp,
/*
* This special macro can be used to load a debugging register
*/
#define loaddebug(thread,r) set_debug(thread->debugreg ## r, r)
#define loaddebug(thread,r) set_debugreg(thread->debugreg ## r, r)

/*
* switch_to(x,y) should switch tasks from x to y.
Expand Down
12 changes: 6 additions & 6 deletions arch/x86_64/kernel/setup64.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,12 @@ void __cpuinit cpu_init (void)
* Clear all 6 debug registers:
*/

set_debug(0UL, 0);
set_debug(0UL, 1);
set_debug(0UL, 2);
set_debug(0UL, 3);
set_debug(0UL, 6);
set_debug(0UL, 7);
set_debugreg(0UL, 0);
set_debugreg(0UL, 1);
set_debugreg(0UL, 2);
set_debugreg(0UL, 3);
set_debugreg(0UL, 6);
set_debugreg(0UL, 7);

fpu_init();
}
4 changes: 1 addition & 3 deletions include/asm-x86_64/suspend.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ extern unsigned long saved_context_r12, saved_context_r13, saved_context_r14, sa
extern unsigned long saved_context_eflags;

#define loaddebug(thread,register) \
__asm__("movq %0,%%db" #register \
: /* no output */ \
:"r" ((thread)->debugreg##register))
set_debugreg((thread)->debugreg##register, register)

extern void fix_processor_context(void);

Expand Down
6 changes: 0 additions & 6 deletions include/asm-x86_64/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@ extern void load_gs_index(unsigned);
".previous" \
: :"r" (value), "r" (0))

#define set_debug(value,register) \
__asm__("movq %0,%%db" #register \
: /* no output */ \
:"r" ((unsigned long) value))


#ifdef __KERNEL__
struct alt_instr {
__u8 *instr; /* original instruction */
Expand Down

0 comments on commit 2b514e7

Please sign in to comment.