diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 08:43:18 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 08:43:18 +1100 |
commit | a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a (patch) | |
tree | 1d2061bbf8ac521bb9839075beb4263752bebb23 /arch/powerpc/include/asm/powernv.h | |
parent | 78e5dfea84dc15d69940831b3981b3014d17222e (diff) | |
parent | 681c617b7c42fce0798c2b0b472f270f28c82d56 (diff) |
Merge branch 'topic/ppc-kvm' into next
This brings in two series from Paul, one of which touches KVM code and
may need to be merged into the kvm-ppc tree to resolve conflicts.
Diffstat (limited to 'arch/powerpc/include/asm/powernv.h')
-rw-r--r-- | arch/powerpc/include/asm/powernv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/powernv.h b/arch/powerpc/include/asm/powernv.h index dc5f6a5d4575..d1c2d2e658cf 100644 --- a/arch/powerpc/include/asm/powernv.h +++ b/arch/powerpc/include/asm/powernv.h @@ -40,6 +40,7 @@ static inline int pnv_npu2_handle_fault(struct npu_context *context, } static inline void pnv_tm_init(void) { } +static inline void pnv_power9_force_smt4(void) { } #endif #endif /* _ASM_POWERNV_H */ |