Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b514e74 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[PATCH] x86_64: eliminate set_debug() 



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: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 893efca9

arch/x86_64/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

arch/x86_64/kernel/setup64.c

+6 −6
Original line number Diff line number Diff line
@@ -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(); 

}

include/asm-x86_64/suspend.h

+1 −3
Original line number Diff line number Diff line
@@ -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);

include/asm-x86_64/system.h

+0 −6
Original line number Diff line number Diff line
@@ -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 */