Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756017AbZFASO5 (ORCPT ); Mon, 1 Jun 2009 14:14:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752993AbZFASOs (ORCPT ); Mon, 1 Jun 2009 14:14:48 -0400 Received: from e28smtp04.in.ibm.com ([59.145.155.4]:53511 "EHLO e28smtp04.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753483AbZFASOr (ORCPT ); Mon, 1 Jun 2009 14:14:47 -0400 Date: Mon, 1 Jun 2009 23:44:26 +0530 From: "K.Prasad" To: Frederic Weisbecker Cc: Linux Kernel Mailing List , Ingo Molnar , Alan Stern , "K.Prasad" Subject: [Patch 05/12] Use wrapper routines around debug registers in processor related functions Message-ID: <20090601181426.GF23582@in.ibm.com> References: <20090601180605.799735829@prasadkr_t60p.in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename=modify_processor_related_05 User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3656 Lines: 119 This patch enables the use of wrapper routines to access the debug/breakpoint registers. Original-patch-by: Alan Stern Signed-off-by: K.Prasad Reviewed-by: Alan Stern --- arch/x86/kernel/smpboot.c | 3 +++ arch/x86/power/cpu_32.c | 13 +++---------- arch/x86/power/cpu_64.c | 12 +++--------- 3 files changed, 9 insertions(+), 19 deletions(-) Index: linux-2.6-tip.hbkpt/arch/x86/kernel/smpboot.c =================================================================== --- linux-2.6-tip.hbkpt.orig/arch/x86/kernel/smpboot.c +++ linux-2.6-tip.hbkpt/arch/x86/kernel/smpboot.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -326,6 +327,7 @@ notrace static void __cpuinit start_seco setup_secondary_clock(); wmb(); + load_debug_registers(); cpu_idle(); } @@ -1252,6 +1254,7 @@ void cpu_disable_common(void) remove_cpu_from_maps(cpu); unlock_vector_lock(); fixup_irqs(); + hw_breakpoint_disable(); } int native_cpu_disable(void) Index: linux-2.6-tip.hbkpt/arch/x86/power/cpu_32.c =================================================================== --- linux-2.6-tip.hbkpt.orig/arch/x86/power/cpu_32.c +++ linux-2.6-tip.hbkpt/arch/x86/power/cpu_32.c @@ -13,6 +13,7 @@ #include #include #include +#include static struct saved_context saved_context; @@ -48,6 +49,7 @@ static void __save_processor_state(struc ctxt->cr2 = read_cr2(); ctxt->cr3 = read_cr3(); ctxt->cr4 = read_cr4_safe(); + hw_breakpoint_disable(); } /* Needed by apm.c */ @@ -83,16 +85,7 @@ static void fix_processor_context(void) /* * Now maybe reload the debug registers */ - if (current->thread.debugreg7) { - set_debugreg(current->thread.debugreg[0], 0); - set_debugreg(current->thread.debugreg[1], 1); - set_debugreg(current->thread.debugreg[2], 2); - set_debugreg(current->thread.debugreg[3], 3); - /* no 4 and 5 */ - set_debugreg(current->thread.debugreg6, 6); - set_debugreg(current->thread.debugreg7, 7); - } - + load_debug_registers(); } static void __restore_processor_state(struct saved_context *ctxt) Index: linux-2.6-tip.hbkpt/arch/x86/power/cpu_64.c =================================================================== --- linux-2.6-tip.hbkpt.orig/arch/x86/power/cpu_64.c +++ linux-2.6-tip.hbkpt/arch/x86/power/cpu_64.c @@ -16,6 +16,7 @@ #include #include #include +#include static void fix_processor_context(void); @@ -71,6 +72,7 @@ static void __save_processor_state(struc ctxt->cr3 = read_cr3(); ctxt->cr4 = read_cr4(); ctxt->cr8 = read_cr8(); + hw_breakpoint_disable(); } void save_processor_state(void) @@ -162,13 +164,5 @@ static void fix_processor_context(void) /* * Now maybe reload the debug registers */ - if (current->thread.debugreg7){ - set_debugreg(current->thread.debugreg[0], 0); - set_debugreg(current->thread.debugreg[1], 1); - set_debugreg(current->thread.debugreg[2], 2); - set_debugreg(current->thread.debugreg[3], 3); - /* no 4 and 5 */ - loaddebug(¤t->thread, 6); - loaddebug(¤t->thread, 7); - } + load_debug_registers(); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/