perf: arm_spe: include linux/vmalloc.h for vmap()
PATCH 1/1 perf: arm_spe: include linux/vmalloc.h for vmap()
On linux-next, I get a build failure in some configurations:
drivers/perf/arm_spe_pmu.c: In function 'arm_spe_pmu_setup_aux':drivers/perf/arm_spe_pmu.c:857:14: error: implicit declaration of function 'vmap'; did you mean 'swap'? [-Werror=implicit-function-declaration]
buf->base = vmap(pglist, nr_pages, VM_MAP, PAGE_KERNEL);
^~~~
swap
drivers/perf/arm_spe_pmu.c:857:37: error: 'VM_MAP' undeclared (first use in this function); did you mean 'VM_MPX'?
buf->base = vmap(pglist, nr_pages, VM_MAP, PAGE_KERNEL);
^~~~~~
VM_MPXdrivers/perf/arm_spe_pmu.c:857:37: note: each undeclared identifier is reported only once for each function it appears in drivers/perf/arm_spe_pmu.c: In function 'arm_spe_pmu_free_aux':drivers/perf/arm_spe_pmu.c:878:2: error: implicit declaration of function 'vunmap'; did you mean 'iounmap'? [-Werror=implicit-function-declaration]
vmap() is declared in linux/vmalloc.h, so we should include that header file.
---
I have not bisected what caused this problem, presumably some other header stopped including vmlinux.h.
--- drivers/perf/arm_spe_pmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/perf/arm_spe_pmu.c +1 -0
@@ -32,6 +32,7 @@#include <linux/perf_event.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/vmalloc.h> #include <asm/sysreg.h>
Signature · 1 line
2.9.0
Quoted 11 lines · Arnd Bergmann
On linux-next, I get a build failure in some configurations:
drivers/perf/arm_spe_pmu.c: In function 'arm_spe_pmu_setup_aux':drivers/perf/arm_spe_pmu.c:857:14: error: implicit declaration of function 'vmap'; did you mean 'swap'? [-Werror=implicit-function-declaration]buf->base = vmap(pglist, nr_pages, VM_MAP, PAGE_KERNEL); ^~~~ swap drivers/perf/arm_spe_pmu.c:857:37: error: 'VM_MAP' undeclared (first use in this function); did you mean 'VM_MPX'? buf->base = vmap(pglist, nr_pages, VM_MAP, PAGE_KERNEL); ^~~~~~ VM_MPX
Quoted 7 lines
drivers/perf/arm_spe_pmu.c:857:37: note: each undeclared identifier is reported only once for each function it appears indrivers/perf/arm_spe_pmu.c: In function 'arm_spe_pmu_free_aux':drivers/perf/arm_spe_pmu.c:878:2: error: implicit declaration of function 'vunmap'; did you mean 'iounmap'? [-Werror=implicit-function-declaration]
vmap()is declared inlinux/vmalloc.h, so we should include that header file.Signed-off-by Arnd Bergmann <[email protected]>
Thanks, Arnd. I'll pick this up for 4.17.
Will
Quoted 30 lines · Arnd Bergmann
On linux-next, I get a build failure in some configurations:
drivers/perf/arm_spe_pmu.c: In function 'arm_spe_pmu_setup_aux':drivers/perf/arm_spe_pmu.c:857:14: error: implicit declaration of function 'vmap'; did you mean 'swap'? [-Werror=implicit-function-declaration]buf->base = vmap(pglist, nr_pages, VM_MAP, PAGE_KERNEL); ^~~~ swap drivers/perf/arm_spe_pmu.c:857:37: error: 'VM_MAP' undeclared (first use in this function); did you mean 'VM_MPX'? buf->base = vmap(pglist, nr_pages, VM_MAP, PAGE_KERNEL); ^~~~~~ VM_MPX
drivers/perf/arm_spe_pmu.c:857:37: note: each undeclared identifier is reported only once for each function it appears indrivers/perf/arm_spe_pmu.c: In function 'arm_spe_pmu_free_aux':drivers/perf/arm_spe_pmu.c:878:2: error: implicit declaration of function 'vunmap'; did you mean 'iounmap'? [-Werror=implicit-function-declaration]
vmap()is declared inlinux/vmalloc.h, so we should include that header file.Signed-off-by Arnd Bergmann <[email protected]>---
I have not bisected what caused this problem, presumably some other header stopped includingvmlinux.h.--- drivers/perf/arm_spe_pmu.c | 1 + 1 file changed, 1 insertion(+)drivers/perf/arm_spe_pmu.c +0
-0
drivers/perf/arm_spe_pmu.c line 35
Quoted 4 lines
drivers/perf/arm_spe_pmu.c +1
-0@@ -32,6 +32,7 @@#include <linux/perf_event.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/vmalloc.h>
This looks good. From a quick look, we're also missing explicit includes for:
#include <linux/bitops.h>
#include <linux/bug.h>
#include <linux/capability.h>
#include <linux/cpumask.h>
#include <linux/device.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/printk.h>
#include <linux/smp.h>
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/mmu.h>
... which would be worth sorting out at teh same time.
Will, are you happy to fold those in? Assuming so:
Mark.