From 27cb0aa035e404ece89e24e3eaa7ca98d47dd99e Mon Sep 17 00:00:00 2001 From: Hongjun Chen Date: Fri, 26 Mar 2010 16:43:46 +0800 Subject: [PATCH] --- yaml --- r: 274235 b: refs/heads/master c: 1661e5bd550bf024b04dfa7abf2963d04ab119e3 h: refs/heads/master i: 274233: 2ce4886a5f8dc87830cb15530be5d91aa2f18c01 274231: 4dfd044571c0e9927c3feb266337199c65ac6c21 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/cpm_common.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8cf064701022..f119af2d23cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c031ab15fff38562cc9e5921c9acc118bd99f42d +refs/heads/master: 1661e5bd550bf024b04dfa7abf2963d04ab119e3 diff --git a/trunk/arch/powerpc/sysdev/cpm_common.c b/trunk/arch/powerpc/sysdev/cpm_common.c index d55d0ad0deab..8db10bb90042 100644 --- a/trunk/arch/powerpc/sysdev/cpm_common.c +++ b/trunk/arch/powerpc/sysdev/cpm_common.c @@ -3,7 +3,7 @@ * * Author: Scott Wood * - * Copyright 2007 Freescale Semiconductor, Inc. + * Copyright 2007-2008,2010 Freescale Semiconductor, Inc. * * Some parts derived from commproc.c/cpm2_common.c, which is: * Copyright (c) 1997 Dan error_act (dmalek@jlc.net) @@ -146,6 +146,7 @@ unsigned long cpm_muram_alloc(unsigned long size, unsigned long align) spin_lock_irqsave(&cpm_muram_lock, flags); cpm_muram_info.alignment = align; start = rh_alloc(&cpm_muram_info, size, "commproc"); + memset(cpm_muram_addr(start), 0, size); spin_unlock_irqrestore(&cpm_muram_lock, flags); return start;