Re: Panic in reserve_memtype()

["Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>]

Adding Peter.

Can you push this patch along.

Thanks
Venki

On Mon, 2010-03-01 at 07:11 -0800, Jack Steiner wrote:
> On Wed, Feb 24, 2010 at 04:05:18PM -0600, Jack Steiner wrote:
> 
> > > 
> > > I guess I found an obvious problem in the code. Can you check whether the
> > > below patch resolves the panic you are seeing.
> > > 
> > > Thanks,
> > > Venki
> > 
> > 
> > Works great!! Thanks...
> 
> 
> Venki
> 
> Were you planning to push this fix upstream? Both the x86 & linux-next tree
> currently fail to boot on EFI-enabled systems because of this bug.
> 
> Thanks...
> 
> 
> --- jack
> > 
> > 
> > > 
> > > 
> > > new->type should only change when there is a valid ret_type. Otherwise
> > > requested type and return type should be same.
> > > 
> > > Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
> > > ---
> > >  arch/x86/mm/pat_rbtree.c |    4 +++-
> > >  1 files changed, 3 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
> > > index e4cd229..58b6de1 100644
> > > --- a/arch/x86/mm/pat_rbtree.c
> > > +++ b/arch/x86/mm/pat_rbtree.c
> > > @@ -223,7 +223,9 @@ int rbt_memtype_check_insert(struct memtype *new, unsigned long *ret_type)
> > >  						new->type, ret_type);
> > >  
> > >  	if (!err) {
> > > -		new->type = *ret_type;
> > > +		if (ret_type)
> > > +			new->type = *ret_type;
> > > +
> > >  		memtype_rb_insert(&memtype_rbroot, new);
> > >  	}
> > >  	return err;
> > > -- 
> > > 1.6.0.6