From 750d82f2628fed8b391e13f80dce73e262275925 Mon Sep 17 00:00:00 2001 From: David Binder Date: Fri, 17 Mar 2017 11:27:04 -0400 Subject: [PATCH] staging: unisys: visorbus: Rename #define VMCALL_IO_CONTROLVM_ADDR Rename #define VMCALL_IO_CONTROLVM_ADDR to VMCALL_CONTROLVM_ADDR, as this vmcall can be used by any partition, not just the IO partition. Signed-off-by: David Binder Signed-off-by: David Kershner Reviewed-by: Tim Sell Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/visorbus/visorchipset.c | 2 +- drivers/staging/unisys/visorbus/vmcallinterface.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index 184cf5fa5d23..c7b7cae68941 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -1321,7 +1321,7 @@ issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes) u64 physaddr; physaddr = virt_to_phys(¶ms); - ISSUE_IO_VMCALL(VMCALL_IO_CONTROLVM_ADDR, physaddr, result); + ISSUE_IO_VMCALL(VMCALL_CONTROLVM_ADDR, physaddr, result); if (VMCALL_SUCCESSFUL(result)) { *control_addr = params.address; *control_bytes = params.channel_bytes; diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h index d1d72c184e29..1a65336a28ee 100644 --- a/drivers/staging/unisys/visorbus/vmcallinterface.h +++ b/drivers/staging/unisys/visorbus/vmcallinterface.h @@ -54,8 +54,8 @@ __unisys_extended_vmcall_gnuc(unsigned long long tuple, return result; } -#ifdef VMCALL_IO_CONTROLVM_ADDR -#undef VMCALL_IO_CONTROLVM_ADDR +#ifdef VMCALL_CONTROLVM_ADDR +#undef VMCALL_CONTROLVM_ADDR #endif /* */ /* define subsystem number for AppOS, used in uislib driver */ @@ -72,7 +72,7 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples */ * type of VMCALL */ /* used by all Guests, not just IO */ - VMCALL_IO_CONTROLVM_ADDR = 0x0501, + VMCALL_CONTROLVM_ADDR = 0x0501, /* Allow caller to query virtual time offset */ VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET = 0x0708, /* LOGEVENT Post Code (RDX) with specified subsystem mask */ @@ -95,7 +95,7 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples */ /* Structures for IO VMCALLs */ -/* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */ +/* Parameters to VMCALL_CONTROLVM_ADDR interface */ struct vmcall_io_controlvm_addr_params { /* The Guest-relative physical address of the ControlVm channel. */ /* This VMCall fills this in with the appropriate address. */ -- 2.45.2