Skip to contentSkip to conversation

git-x86 mm branch compile error

DISCUSSION Applied Kevin Winchester 2 participants 3 messages Feb 13, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

#1 lore raw
Quoted 7 lines · Kevin Winchester

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

Quoted 5 lines

at tip 5248bbad9c72dd576aa8f3b44b5a959a7cae6ce1 x86: make DEBUG_PAGEALLOC & HIBERNATE work

I assume the following is an acceptable fix (it will be completely whitespace damaged due to thunderbird, but I think you get the idea)

arch/x86/mm/pageattr.c +0 -0
index cf91149..76a3de5 100644
@@ -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;

}

#2 lore raw
Quoted 10 lines · Kevin Winchester
Quoted 9 lines · Kevin Winchester

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.

Quoted 2 lines

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

Quoted 15 lines
arch/x86/mm/pageattr.c +1 -1
index cf91149..76a3de5 100644
@@ -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;

}