summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup-common.c
diff options
context:
space:
mode:
authorKevin Hao2016-07-23 11:12:40 +0200
committerMichael Ellerman2016-08-01 03:15:03 +0200
commitb92a226e528423b8d249dd09bb450d53361fbfcb (patch)
treedd863ac94d80043727c82ab52210f505df5da013 /arch/powerpc/kernel/setup-common.c
parentpowerpc: Remove mfvtb() (diff)
downloadkernel-qcow2-linux-b92a226e528423b8d249dd09bb450d53361fbfcb.tar.gz
kernel-qcow2-linux-b92a226e528423b8d249dd09bb450d53361fbfcb.tar.xz
kernel-qcow2-linux-b92a226e528423b8d249dd09bb450d53361fbfcb.zip
powerpc: Move cpu_has_feature() to a separate file
We plan to use jump label for cpu_has_feature(). In order to implement this we need to include the linux/jump_label.h in asm/cputable.h. Unfortunately if we do that it leads to an include loop. The root of the problem seems to be that reg.h needs cputable.h (for CPU_FTRs), and then cputable.h via jump_label.h eventually pulls in hw_irq.h which needs reg.h (for MSR_EE). So move cpu_has_feature() to a separate file on its own. Signed-off-by: Kevin Hao <haokexin@gmail.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> [mpe: Rename to cpu_has_feature.h and flesh out change log] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r--arch/powerpc/kernel/setup-common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 714b4ba7ab86..dba265c586df 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -66,6 +66,7 @@
#include <asm/hugetlb.h>
#include <asm/livepatch.h>
#include <asm/mmu_context.h>
+#include <asm/cpu_has_feature.h>
#include "setup.h"