[PATCH] kgdb, ppc: Corrected the address using of current->thread.evr register

Kumar Gala galak at kernel.crashing.org
Thu Nov 18 05:58:00 EST 2010


> From: Dongdong Deng <dongdong.deng at windriver.com>
> Date: Tue, 16 Nov 2010 16:02:00 -0600
> Subject: [PATCH 4/4] kgdb: Fix regression in evr register handling
> 
> Commit ff10b88b5a05c8f1646dd15fb9f6093c1384ff6d (kgdb,ppc: Individual
> register get/set for ppc) introduced a problem where memcpy was used
> incorrectly to read and write the evr registers with a kernel that
> has:
> 
> CONFIG_FSL_BOOKE=y
> CONFIG_SPE=y
> CONFIG_KGDB=y
> 
> This patch also fixes the following compilation problems:
> 
> arch/powerpc/kernel/kgdb.c: In function 'dbg_get_reg':
> arch/powerpc/kernel/kgdb.c:341: error: passing argument 2 of 'memcpy' makes pointer from integer without a cast
> arch/powerpc/kernel/kgdb.c: In function 'dbg_set_reg':
> arch/powerpc/kernel/kgdb.c:366: error: passing argument 1 of 'memcpy' makes pointer from integer without a cast
> 
> [jason.wessel at windriver.com: Remove void * casts and fix patch header]
> Reported-by: Milton Miller <miltonm at bga.com>
> Signed-off-by: Dongdong Deng <dongdong.deng at windriver.com>
> Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
> CC: linuxppc-dev at lists.ozlabs.org
> ---
> arch/powerpc/kernel/kgdb.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
> index 7a9db64..42850ee 100644
> --- a/arch/powerpc/kernel/kgdb.c
> +++ b/arch/powerpc/kernel/kgdb.c
> @@ -337,7 +337,7 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
> 		/* FP registers 32 -> 63 */
> #if defined(CONFIG_FSL_BOOKE) && defined(CONFIG_SPE)
> 		if (current)
> -			memcpy(mem, current->thread.evr[regno-32],
> +			memcpy(mem, &current->thread.evr[regno-32],
> 					dbg_reg_def[regno].size);
> #else
> 		/* fp registers not used by kernel, leave zero */
> @@ -362,7 +362,7 @@ int dbg_set_reg(int regno, void *mem, struct pt_regs *regs)
> 	if (regno >= 32 && regno < 64) {
> 		/* FP registers 32 -> 63 */
> #if defined(CONFIG_FSL_BOOKE) && defined(CONFIG_SPE)
> -		memcpy(current->thread.evr[regno-32], mem,
> +		memcpy(&current->thread.evr[regno-32], mem,
> 				dbg_reg_def[regno].size);
> #else
> 		/* fp registers not used by kernel, leave zero */
> -- 
> 1.7.0.4

Acked-by: Kumar Gala <galak at kernel.crashing.org>

- k



More information about the Linuxppc-dev mailing list