diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-11-04 09:20:57 +0100 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-11-04 09:20:57 +0100 |
| commit | 95f328d3ad1a8e4e3175a18546fb35c495e31130 (patch) | |
| tree | 2f6496ef8354e9a0a315f23faef744f93fee8265 /arch/powerpc/include/asm/paca.h | |
| parent | KVM: x86: fix emulation of "movzbl %bpl, %eax" (diff) | |
| parent | kvm: powerpc: book3s: drop is_hv_enabled (diff) | |
| download | linux-95f328d3ad1a8e4e3175a18546fb35c495e31130.tar.xz linux-95f328d3ad1a8e4e3175a18546fb35c495e31130.zip | |
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
Conflicts:
arch/powerpc/include/asm/processor.h
Diffstat (limited to 'arch/powerpc/include/asm/paca.h')
| -rw-r--r-- | arch/powerpc/include/asm/paca.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h index a5954cebbc55..b6ea9e068c13 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -166,7 +166,7 @@ struct paca_struct { struct dtl_entry *dtl_curr; /* pointer corresponding to dtl_ridx */ #ifdef CONFIG_KVM_BOOK3S_HANDLER -#ifdef CONFIG_KVM_BOOK3S_PR +#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE /* We use this to store guest state in */ struct kvmppc_book3s_shadow_vcpu shadow_vcpu; #endif |