diff options
| author | James Hogan <james.hogan@imgtec.com> | 2015-12-16 18:49:28 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-01-23 21:07:35 -0500 |
| commit | 9fd4af639b8585a0c9949e6e3ffc8e2c829dedb5 (patch) | |
| tree | d1d5fbb1ea11459b8dddfc3cc23113bf8f4bd89c | |
| parent | 4c53e6b985c65aa7e6e038ed83d0ba10e72201e8 (diff) | |
MIPS: Move definition of DC bit to mipsregs.h
The CAUSEB_DC and CAUSEF_DC definitions used by KVM are defined in
asm/kvm_host.h, but all the other Cause register field definitions are
found in asm/mipsregs.h.
Lets reunite the DC bit definitions with its friends in mipsregs.h.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11885/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/include/asm/kvm_host.h | 3 | ||||
| -rw-r--r-- | arch/mips/include/asm/mipsregs.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h index 17782205c5db..b14265d8d606 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h | |||
| @@ -92,9 +92,6 @@ | |||
| 92 | #define KVM_INVALID_INST 0xdeadbeef | 92 | #define KVM_INVALID_INST 0xdeadbeef |
| 93 | #define KVM_INVALID_ADDR 0xdeadbeef | 93 | #define KVM_INVALID_ADDR 0xdeadbeef |
| 94 | 94 | ||
| 95 | #define CAUSEB_DC 27 | ||
| 96 | #define CAUSEF_DC (_ULCAST_(1) << 27) | ||
| 97 | |||
| 98 | extern atomic_t kvm_mips_instance; | 95 | extern atomic_t kvm_mips_instance; |
| 99 | extern pfn_t(*kvm_mips_gfn_to_pfn) (struct kvm *kvm, gfn_t gfn); | 96 | extern pfn_t(*kvm_mips_gfn_to_pfn) (struct kvm *kvm, gfn_t gfn); |
| 100 | extern void (*kvm_mips_release_pfn_clean) (pfn_t pfn); | 97 | extern void (*kvm_mips_release_pfn_clean) (pfn_t pfn); |
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index e43aca183c99..af36d2be4d0d 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h | |||
| @@ -394,6 +394,8 @@ | |||
| 394 | #define CAUSEF_IV (_ULCAST_(1) << 23) | 394 | #define CAUSEF_IV (_ULCAST_(1) << 23) |
| 395 | #define CAUSEB_PCI 26 | 395 | #define CAUSEB_PCI 26 |
| 396 | #define CAUSEF_PCI (_ULCAST_(1) << 26) | 396 | #define CAUSEF_PCI (_ULCAST_(1) << 26) |
| 397 | #define CAUSEB_DC 27 | ||
| 398 | #define CAUSEF_DC (_ULCAST_(1) << 27) | ||
| 397 | #define CAUSEB_CE 28 | 399 | #define CAUSEB_CE 28 |
| 398 | #define CAUSEF_CE (_ULCAST_(3) << 28) | 400 | #define CAUSEF_CE (_ULCAST_(3) << 28) |
| 399 | #define CAUSEB_TI 30 | 401 | #define CAUSEB_TI 30 |
