diff options
| author | Paul Mackerras <paulus@samba.org> | 2011-06-29 00:18:26 +0000 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-07-12 13:16:48 +0300 |
| commit | b01c8b54a1a271c0fc4243845927fe1d250767a3 (patch) | |
| tree | 4e818a41d602aa07cbdc06eca9372b9b95c533a4 /arch/powerpc/platforms/iseries/exception.S | |
| parent | f05ed4d56e9cff1c46d2b3049ba0c72e7e29392f (diff) | |
| download | linux-3.10-b01c8b54a1a271c0fc4243845927fe1d250767a3.tar.gz linux-3.10-b01c8b54a1a271c0fc4243845927fe1d250767a3.tar.bz2 linux-3.10-b01c8b54a1a271c0fc4243845927fe1d250767a3.zip | |
powerpc, KVM: Rework KVM checks in first-level interrupt handlers
Instead of branching out-of-line with the DO_KVM macro to check if we
are in a KVM guest at the time of an interrupt, this moves the KVM
check inline in the first-level interrupt handlers. This speeds up
the non-KVM case and makes sure that none of the interrupt handlers
are missing the check.
Because the first-level interrupt handlers are now larger, some things
had to be move out of line in exceptions-64s.S.
This all necessitated some minor changes to the interrupt entry code
in KVM. This also streamlines the book3s_32 KVM test.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/platforms/iseries/exception.S')
| -rw-r--r-- | arch/powerpc/platforms/iseries/exception.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S index 29c02f36b32..f519ee17ff7 100644 --- a/arch/powerpc/platforms/iseries/exception.S +++ b/arch/powerpc/platforms/iseries/exception.S @@ -167,7 +167,7 @@ BEGIN_FTR_SECTION std r12,PACA_EXGEN+EX_R13(r13) EXCEPTION_PROLOG_ISERIES_1 FTR_SECTION_ELSE - EXCEPTION_PROLOG_1(PACA_EXGEN) + EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, 0) EXCEPTION_PROLOG_ISERIES_1 ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_SLB) b data_access_common |