diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-14 17:18:29 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-14 17:18:29 +1100 |
| commit | da0e7e6276968fcc61ac7484d0026cd5fdd94dc3 (patch) | |
| tree | 79a03731cca75ab4a41e7e7162288b22150811a3 /arch/powerpc/include/asm/head-64.h | |
| parent | a05ef161cdd22faccffe06f21fc8f1e249565385 (diff) | |
| parent | ab9bad0ead9ab179ace09988a3f1cfca122eb7c2 (diff) | |
| download | lwn-da0e7e6276968fcc61ac7484d0026cd5fdd94dc3.tar.gz lwn-da0e7e6276968fcc61ac7484d0026cd5fdd94dc3.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge the topic branch we're sharing with the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/include/asm/head-64.h')
| -rw-r--r-- | arch/powerpc/include/asm/head-64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/head-64.h b/arch/powerpc/include/asm/head-64.h index a475711cd9c3..5067048daad4 100644 --- a/arch/powerpc/include/asm/head-64.h +++ b/arch/powerpc/include/asm/head-64.h @@ -224,7 +224,7 @@ name: #ifdef CONFIG_KVM_BOOK3S_64_HANDLER #define TRAMP_KVM_BEGIN(name) \ - TRAMP_REAL_BEGIN(name) + TRAMP_VIRT_BEGIN(name) #else #define TRAMP_KVM_BEGIN(name) #endif |