diff options
| author | Avi Kivity <avi@redhat.com> | 2012-06-06 08:31:34 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-06-06 08:31:34 -0400 |
| commit | 25e531a988ea5a64bd97a72dc9d3c65ad5850120 (patch) | |
| tree | 5e5b7450fe08e4818a49b4248c9400a08b4cc463 /arch/powerpc/include/asm/epapr_hcalls.h | |
| parent | 79f702a6d18c75760c68202007265b2310d6f44e (diff) | |
| parent | d35b1075afc0172caa44b57b56a2b9b57e06d32e (diff) | |
Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next
Alex says:
"Changes this time include:
- Generalize KVM_GUEST support to overall ePAPR code
- Fix reset for Book3S HV
- Fix machine check deferral when CONFIG_KVM_GUEST=y
- Add support for BookE register DECAR"
* 'for-upstream' of git://github.com/agraf/linux-2.6:
KVM: PPC: Not optimizing MSR_CE and MSR_ME with paravirt.
KVM: PPC: booke: Added DECAR support
KVM: PPC: Book3S HV: Make the guest hash table size configurable
KVM: PPC: Factor out guest epapr initialization
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/include/asm/epapr_hcalls.h')
| -rw-r--r-- | arch/powerpc/include/asm/epapr_hcalls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h index 976835d8f22e..bf2c06c33871 100644 --- a/arch/powerpc/include/asm/epapr_hcalls.h +++ b/arch/powerpc/include/asm/epapr_hcalls.h | |||
| @@ -153,6 +153,8 @@ | |||
| 153 | #define EV_HCALL_CLOBBERS2 EV_HCALL_CLOBBERS3, "r5" | 153 | #define EV_HCALL_CLOBBERS2 EV_HCALL_CLOBBERS3, "r5" |
| 154 | #define EV_HCALL_CLOBBERS1 EV_HCALL_CLOBBERS2, "r4" | 154 | #define EV_HCALL_CLOBBERS1 EV_HCALL_CLOBBERS2, "r4" |
| 155 | 155 | ||
| 156 | extern bool epapr_paravirt_enabled; | ||
| 157 | extern u32 epapr_hypercall_start[]; | ||
| 156 | 158 | ||
| 157 | /* | 159 | /* |
| 158 | * We use "uintptr_t" to define a register because it's guaranteed to be a | 160 | * We use "uintptr_t" to define a register because it's guaranteed to be a |