From: Bartlomiej Zolnierkiewicz Date: Wed, 29 Apr 2020 10:48:24 +0000 (+0200) Subject: video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y && PPC32=n X-Git-Tag: baikal/mips/sdk5.9~13559^2~13^2~29 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=00880614ee6b30d55f978129e1bde0d63b70e566;p=kernel.git video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y && PPC32=n powerpc allyesconfig fails like this: drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap': drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? [-Werror=implicit-function-declaration] 756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot); | ^~~~~~~~~~~~~~~~~~~ | pgprot_cached drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct '} from type 'int' Fix it by adding missing PPC32 dependency. Fixes: fd4939f31933 ("video: fbdev: controlfb: add COMPILE_TEST support") Reported-by: Stephen Rothwell Reported-by: kbuild test robot Cc: Sam Ravnborg Cc: Daniel Vetter Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sam Ravnborg Link: https://patchwork.freedesktop.org/patch/msgid/fe520316-3863-e6c4-9581-5d709f49e906@samsung.com --- diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index 52170ed20e745..9c4f1be856eca 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -55,7 +55,7 @@ #include "macmodes.h" #include "controlfb.h" -#ifndef CONFIG_PPC_PMAC +#if !defined(CONFIG_PPC_PMAC) || !defined(CONFIG_PPC32) #define invalid_vram_cache(addr) #undef in_8 #undef out_8