diff options
author | Kevin Hao <haokexin@gmail.com> | 2016-07-23 05:12:40 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-31 21:15:03 -0400 |
commit | b92a226e528423b8d249dd09bb450d53361fbfcb (patch) | |
tree | dd863ac94d80043727c82ab52210f505df5da013 /arch/powerpc/include/asm/book3s/64/mmu-hash.h | |
parent | 905259e33d0ca0ee8e0d55783c3eef3402df81b7 (diff) |
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/include/asm/book3s/64/mmu-hash.h')
-rw-r--r-- | arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h index 5eaf86ac143d..032e9f0bc708 100644 --- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h +++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <asm/book3s/64/pgtable.h> | 24 | #include <asm/book3s/64/pgtable.h> |
25 | #include <asm/bug.h> | 25 | #include <asm/bug.h> |
26 | #include <asm/processor.h> | 26 | #include <asm/processor.h> |
27 | #include <asm/cpu_has_feature.h> | ||
27 | 28 | ||
28 | /* | 29 | /* |
29 | * SLB | 30 | * SLB |