On Tue, 12 Feb 2008, Kevin Winchester wrote: > Kevin Winchester wrote: > > CC arch/x86/mm/pageattr.o > > arch/x86/mm/pageattr.c: In function ‘change_page_attr_set_clr’: > > arch/x86/mm/pageattr.c:778: error: incompatible type for argument 1 of > > ‘cpa_check_alias’ > > make[1]: *** [arch/x86/mm/pageattr.o] Error 1 > > make: *** [arch/x86/mm] Error 2 > > > > at tip 5248bbad9c72dd576aa8f3b44b5a959a7cae6ce1 x86: make > > DEBUG_PAGEALLOC & HIBERNATE work
Sorry. I pushed the wrong branch out. > I assume the following is an acceptable fix (it will be completely > whitespace damaged due to thunderbird, but I think you get the idea) Applied. Thanks, tglx > diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c > index cf91149..76a3de5 100644 > --- a/arch/x86/mm/pageattr.c > +++ b/arch/x86/mm/pageattr.c > @@ -729,7 +729,7 @@ cpa_check_alias(struct cpa_data *cpa, unsigned long > addr, int numpages) > #else > > static int > -cpa_check_alias(struct cpa_data cpa, unsigned long addr, int numpages) > +cpa_check_alias(struct cpa_data *cpa, unsigned long addr, int numpages) > { > return 0; > } >