From: Roland McGrath This moves the macro loaddebug from asm-i386/suspend.h to asm-i386/processor.h, which is the place that makes sense for it to be defined, removes the extra copy of the same macro in arch/i386/kernel/process.c, and makes arch/i386/kernel/signal.c use the macro in place of its expansion. This is a purely cosmetic cleanup for the normal i386 kernel. However, it is handy for Xen to be able to just redefine the loaddebug macro once instead of also changing the signal.c code. Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton --- 25-akpm/arch/i386/kernel/process.c | 7 ------- 25-akpm/arch/i386/kernel/signal.c | 2 +- 25-akpm/include/asm-i386/processor.h | 8 ++++++++ 25-akpm/include/asm-i386/suspend.h | 5 ----- 4 files changed, 9 insertions(+), 13 deletions(-) diff -puN arch/i386/kernel/process.c~i386-use-loaddebug-macro-consistently arch/i386/kernel/process.c --- 25/arch/i386/kernel/process.c~i386-use-loaddebug-macro-consistently Fri Apr 8 16:19:16 2005 +++ 25-akpm/arch/i386/kernel/process.c Fri Apr 8 16:19:16 2005 @@ -548,13 +548,6 @@ handle_io_bitmap(struct thread_struct *n */ tss->io_bitmap_base = INVALID_IO_BITMAP_OFFSET_LAZY; } -/* - * This special macro can be used to load a debugging register - */ -#define loaddebug(thread,register) \ - __asm__("movl %0,%%db" #register \ - : /* no output */ \ - :"r" (thread->debugreg[register])) /* * switch_to(x,yn) should switch tasks from x to y. diff -puN arch/i386/kernel/signal.c~i386-use-loaddebug-macro-consistently arch/i386/kernel/signal.c --- 25/arch/i386/kernel/signal.c~i386-use-loaddebug-macro-consistently Fri Apr 8 16:19:16 2005 +++ 25-akpm/arch/i386/kernel/signal.c Fri Apr 8 16:19:16 2005 @@ -618,7 +618,7 @@ int fastcall do_signal(struct pt_regs *r * inside the kernel. */ if (unlikely(current->thread.debugreg[7])) { - __asm__("movl %0,%%db7" : : "r" (current->thread.debugreg[7])); + loaddebug(¤t->thread, 7); } /* Whee! Actually deliver the signal. */ diff -puN include/asm-i386/processor.h~i386-use-loaddebug-macro-consistently include/asm-i386/processor.h --- 25/include/asm-i386/processor.h~i386-use-loaddebug-macro-consistently Fri Apr 8 16:19:16 2005 +++ 25-akpm/include/asm-i386/processor.h Fri Apr 8 16:19:16 2005 @@ -499,6 +499,14 @@ static inline void load_esp0(struct tss_ regs->esp = new_esp; \ } while (0) +/* + * This special macro can be used to load a debugging register + */ +#define loaddebug(thread,register) \ + __asm__("movl %0,%%db" #register \ + : /* no output */ \ + :"r" ((thread)->debugreg[register])) + /* Forward declaration, a strange C thing */ struct task_struct; struct mm_struct; diff -puN include/asm-i386/suspend.h~i386-use-loaddebug-macro-consistently include/asm-i386/suspend.h --- 25/include/asm-i386/suspend.h~i386-use-loaddebug-macro-consistently Fri Apr 8 16:19:16 2005 +++ 25-akpm/include/asm-i386/suspend.h Fri Apr 8 16:19:16 2005 @@ -36,11 +36,6 @@ struct saved_context { unsigned long return_address; } __attribute__((packed)); -#define loaddebug(thread,register) \ - __asm__("movl %0,%%db" #register \ - : /* no output */ \ - :"r" ((thread)->debugreg[register])) - #ifdef CONFIG_ACPI_SLEEP extern unsigned long saved_eip; extern unsigned long saved_esp; _