diff mbox

powerpc: cputhreads: Add missing include file

Message ID 1471207997-12119-1-git-send-email-linux@roeck-us.net (mailing list archive)
State Accepted
Delegated to: Benjamin Herrenschmidt
Headers show

Commit Message

Guenter Roeck Aug. 14, 2016, 8:53 p.m. UTC
Powerpc builds may fail with the following build error.

Error log:
In file included from ./arch/powerpc/include/asm/mmu_context.h:11:0,
                 from ./include/linux/mmu_context.h:4,
		 from mm/mmu_context.c:8:
./arch/powerpc/include/asm/cputhreads.h: In function 'get_tensr':
./arch/powerpc/include/asm/cputhreads.h:101:2: error:
	implicit declaration of function 'cpu_has_feature'

The problem can be triggered by configuring ppc64e_defconfig and selecting
CONFIG_TICK_CPU_ACCOUNTING instead of CONFIG_VIRT_CPU_ACCOUNTING_NATIVE.

Fixes: b92a226e5284 ("powerpc: Move cpu_has_feature() to a separate file")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
This is the second attempt to fix this problem. The first attempt was
with commit 546c4402c574 ("powerpc/vdso: Add missing include file"). This
was not complete because it added the include file to an affected source
file, not to the file where cpu_has_feature() was used.

Build tested all default configurations to ensure that this patch does not
introduce a regression.

 arch/powerpc/include/asm/cputhreads.h | 1 +
 1 file changed, 1 insertion(+)
diff mbox

Patch

diff --git a/arch/powerpc/include/asm/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h
index 666bef4ebfae..9377bdf42eb8 100644
--- a/arch/powerpc/include/asm/cputhreads.h
+++ b/arch/powerpc/include/asm/cputhreads.h
@@ -3,6 +3,7 @@ 
 
 #ifndef __ASSEMBLY__
 #include <linux/cpumask.h>
+#include <asm/cpu_has_feature.h>
 
 /*
  * Mapping of threads to cores