diff options
Diffstat (limited to 'arch/mips/kvm')
| -rw-r--r-- | arch/mips/kvm/Makefile | 8 | ||||
| -rw-r--r-- | arch/mips/kvm/callback.c (renamed from arch/mips/kvm/kvm_cb.c) | 0 | ||||
| -rw-r--r-- | arch/mips/kvm/commpage.c (renamed from arch/mips/kvm/kvm_mips_commpage.c) | 2 | ||||
| -rw-r--r-- | arch/mips/kvm/commpage.h (renamed from arch/mips/kvm/kvm_mips_comm.h) | 0 | ||||
| -rw-r--r-- | arch/mips/kvm/dyntrans.c (renamed from arch/mips/kvm/kvm_mips_dyntrans.c) | 2 | ||||
| -rw-r--r-- | arch/mips/kvm/emulate.c (renamed from arch/mips/kvm/kvm_mips_emul.c) | 6 | ||||
| -rw-r--r-- | arch/mips/kvm/interrupt.c (renamed from arch/mips/kvm/kvm_mips_int.c) | 2 | ||||
| -rw-r--r-- | arch/mips/kvm/interrupt.h (renamed from arch/mips/kvm/kvm_mips_int.h) | 0 | ||||
| -rw-r--r-- | arch/mips/kvm/locore.S (renamed from arch/mips/kvm/kvm_locore.S) | 0 | ||||
| -rw-r--r-- | arch/mips/kvm/mips.c (renamed from arch/mips/kvm/kvm_mips.c) | 6 | ||||
| -rw-r--r-- | arch/mips/kvm/opcode.h (renamed from arch/mips/kvm/kvm_mips_opcode.h) | 0 | ||||
| -rw-r--r-- | arch/mips/kvm/stats.c (renamed from arch/mips/kvm/kvm_mips_stats.c) | 0 | ||||
| -rw-r--r-- | arch/mips/kvm/tlb.c (renamed from arch/mips/kvm/kvm_tlb.c) | 0 | ||||
| -rw-r--r-- | arch/mips/kvm/trap_emul.c (renamed from arch/mips/kvm/kvm_trap_emul.c) | 4 |
14 files changed, 15 insertions, 15 deletions
diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile index 78d87bbc99db..401fe027c261 100644 --- a/arch/mips/kvm/Makefile +++ b/arch/mips/kvm/Makefile @@ -5,9 +5,9 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) EXTRA_CFLAGS += -Ivirt/kvm -Iarch/mips/kvm -kvm-objs := $(common-objs) kvm_mips.o kvm_mips_emul.o kvm_locore.o \ - kvm_mips_int.o kvm_mips_stats.o kvm_mips_commpage.o \ - kvm_mips_dyntrans.o kvm_trap_emul.o +kvm-objs := $(common-objs) mips.o emulate.o locore.o \ + interrupt.o stats.o commpage.o \ + dyntrans.o trap_emul.o obj-$(CONFIG_KVM) += kvm.o -obj-y += kvm_cb.o kvm_tlb.o +obj-y += callback.o tlb.o diff --git a/arch/mips/kvm/kvm_cb.c b/arch/mips/kvm/callback.c index 313c2e37b978..313c2e37b978 100644 --- a/arch/mips/kvm/kvm_cb.c +++ b/arch/mips/kvm/callback.c diff --git a/arch/mips/kvm/kvm_mips_commpage.c b/arch/mips/kvm/commpage.c index 4b5612b34fef..61b9c043ea09 100644 --- a/arch/mips/kvm/kvm_mips_commpage.c +++ b/arch/mips/kvm/commpage.c @@ -22,7 +22,7 @@ #include <linux/kvm_host.h> -#include "kvm_mips_comm.h" +#include "commpage.h" void kvm_mips_commpage_init(struct kvm_vcpu *vcpu) { diff --git a/arch/mips/kvm/kvm_mips_comm.h b/arch/mips/kvm/commpage.h index 08c5fa2bbc0f..08c5fa2bbc0f 100644 --- a/arch/mips/kvm/kvm_mips_comm.h +++ b/arch/mips/kvm/commpage.h diff --git a/arch/mips/kvm/kvm_mips_dyntrans.c b/arch/mips/kvm/dyntrans.c index fa7184df5450..521121bdebff 100644 --- a/arch/mips/kvm/kvm_mips_dyntrans.c +++ b/arch/mips/kvm/dyntrans.c @@ -18,7 +18,7 @@ #include <linux/bootmem.h> #include <asm/cacheflush.h> -#include "kvm_mips_comm.h" +#include "commpage.h" #define SYNCI_TEMPLATE 0x041f0000 #define SYNCI_BASE(x) (((x) >> 21) & 0x1f) diff --git a/arch/mips/kvm/kvm_mips_emul.c b/arch/mips/kvm/emulate.c index f9b4f0fa425d..1a6068892e66 100644 --- a/arch/mips/kvm/kvm_mips_emul.c +++ b/arch/mips/kvm/emulate.c @@ -29,9 +29,9 @@ #include <asm/r4kcache.h> #define CONFIG_MIPS_MT -#include "kvm_mips_opcode.h" -#include "kvm_mips_int.h" -#include "kvm_mips_comm.h" +#include "opcode.h" +#include "interrupt.h" +#include "commpage.h" #include "trace.h" diff --git a/arch/mips/kvm/kvm_mips_int.c b/arch/mips/kvm/interrupt.c index d458c042d558..9b4445940c2b 100644 --- a/arch/mips/kvm/kvm_mips_int.c +++ b/arch/mips/kvm/interrupt.c @@ -20,7 +20,7 @@ #include <linux/kvm_host.h> -#include "kvm_mips_int.h" +#include "interrupt.h" void kvm_mips_queue_irq(struct kvm_vcpu *vcpu, uint32_t priority) { diff --git a/arch/mips/kvm/kvm_mips_int.h b/arch/mips/kvm/interrupt.h index 4ab4bdfad703..4ab4bdfad703 100644 --- a/arch/mips/kvm/kvm_mips_int.h +++ b/arch/mips/kvm/interrupt.h diff --git a/arch/mips/kvm/kvm_locore.S b/arch/mips/kvm/locore.S index d7279c03c517..d7279c03c517 100644 --- a/arch/mips/kvm/kvm_locore.S +++ b/arch/mips/kvm/locore.S diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/mips.c index 289b4d2ae45c..d687c6e3258d 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/mips.c @@ -21,8 +21,8 @@ #include <linux/kvm_host.h> -#include "kvm_mips_int.h" -#include "kvm_mips_comm.h" +#include "interrupt.h" +#include "commpage.h" #define CREATE_TRACE_POINTS #include "trace.h" @@ -1188,7 +1188,7 @@ int __init kvm_mips_init(void) /* * On MIPS, kernel modules are executed from "mapped space", which * requires TLBs. The TLB handling code is statically linked with - * the rest of the kernel (kvm_tlb.c) to avoid the possibility of + * the rest of the kernel (tlb.c) to avoid the possibility of * double faulting. The issue is that the TLB code references * routines that are part of the the KVM module, which are only * available once the module is loaded. diff --git a/arch/mips/kvm/kvm_mips_opcode.h b/arch/mips/kvm/opcode.h index 03a6ae84c7df..03a6ae84c7df 100644 --- a/arch/mips/kvm/kvm_mips_opcode.h +++ b/arch/mips/kvm/opcode.h diff --git a/arch/mips/kvm/kvm_mips_stats.c b/arch/mips/kvm/stats.c index a74d6024c5ad..a74d6024c5ad 100644 --- a/arch/mips/kvm/kvm_mips_stats.c +++ b/arch/mips/kvm/stats.c diff --git a/arch/mips/kvm/kvm_tlb.c b/arch/mips/kvm/tlb.c index bbcd82242059..bbcd82242059 100644 --- a/arch/mips/kvm/kvm_tlb.c +++ b/arch/mips/kvm/tlb.c diff --git a/arch/mips/kvm/kvm_trap_emul.c b/arch/mips/kvm/trap_emul.c index bd2f6bc64d45..fd7257b70e65 100644 --- a/arch/mips/kvm/kvm_trap_emul.c +++ b/arch/mips/kvm/trap_emul.c @@ -16,8 +16,8 @@ #include <linux/kvm_host.h> -#include "kvm_mips_opcode.h" -#include "kvm_mips_int.h" +#include "opcode.h" +#include "interrupt.h" static gpa_t kvm_trap_emul_gva_to_gpa_cb(gva_t gva) { |