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.h | |
| parent | KVM: PPC: Split out code from book3s.c into book3s_pr.c (diff) | |
| download | linux-dev-b01c8b54a1a271c0fc4243845927fe1d250767a3.tar.xz linux-dev-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 '')
| -rw-r--r-- | arch/powerpc/platforms/iseries/exception.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/iseries/exception.h b/arch/powerpc/platforms/iseries/exception.h index bae3fba5ad8e..50271b550a99 100644 --- a/arch/powerpc/platforms/iseries/exception.h +++ b/arch/powerpc/platforms/iseries/exception.h @@ -39,7 +39,7 @@ label##_iSeries: \ HMT_MEDIUM; \ mtspr SPRN_SPRG_SCRATCH0,r13; /* save r13 */ \ - EXCEPTION_PROLOG_1(area); \ + EXCEPTION_PROLOG_1(area, NOTEST, 0); \ EXCEPTION_PROLOG_ISERIES_1; \ b label##_common @@ -48,7 +48,7 @@ label##_iSeries: \ label##_iSeries: \ HMT_MEDIUM; \ mtspr SPRN_SPRG_SCRATCH0,r13; /* save r13 */ \ - EXCEPTION_PROLOG_1(PACA_EXGEN); \ + EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, 0); \ lbz r10,PACASOFTIRQEN(r13); \ cmpwi 0,r10,0; \ beq- label##_iSeries_masked; \ |