diff options
author | Greg Kroah-Hartman | 2009-07-15 00:10:26 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2009-09-15 21:01:46 +0200 |
commit | 59471438ccbebafb0d63baf8b818d0ca692f882a (patch) | |
tree | df7f285d71108dc1b382b9d4a423e9588dc51135 /drivers/staging/hv/Hv.c | |
parent | Staging: hv: remove UINT32 and INT32 typedefs (diff) | |
download | kernel-qcow2-linux-59471438ccbebafb0d63baf8b818d0ca692f882a.tar.gz kernel-qcow2-linux-59471438ccbebafb0d63baf8b818d0ca692f882a.tar.xz kernel-qcow2-linux-59471438ccbebafb0d63baf8b818d0ca692f882a.zip |
Staging: hv: remove UINT64 and INT64 and UCHAR typedefs
The UINT64 and INT64 and UCHAR typedefs are now removed from the Hyper-V
driver code.
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/Hv.c')
-rw-r--r-- | drivers/staging/hv/Hv.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index 20686d574a4d..a8c7d73b1c17 100644 --- a/drivers/staging/hv/Hv.c +++ b/drivers/staging/hv/Hv.c @@ -158,17 +158,17 @@ Description: Invoke the specified hypercall --*/ -static UINT64 +static u64 HvDoHypercall ( - UINT64 Control, + u64 Control, void* Input, void* Output ) { #ifdef CONFIG_X86_64 - UINT64 hvStatus=0; - UINT64 inputAddress = (Input)? GetPhysicalAddress(Input) : 0; - UINT64 outputAddress = (Output)? GetPhysicalAddress(Output) : 0; + u64 hvStatus=0; + u64 inputAddress = (Input)? GetPhysicalAddress(Input) : 0; + u64 outputAddress = (Output)? GetPhysicalAddress(Output) : 0; volatile void* hypercallPage = gHvContext.HypercallPage; DPRINT_DBG(VMBUS, "Hypercall <control %llx input phys %llx virt %p output phys %llx virt %p hypercall %p>", @@ -192,10 +192,10 @@ HvDoHypercall ( u32 controlLo = Control & 0xFFFFFFFF; u32 hvStatusHi = 1; u32 hvStatusLo = 1; - UINT64 inputAddress = (Input) ? GetPhysicalAddress(Input) : 0; + u64 inputAddress = (Input) ? GetPhysicalAddress(Input) : 0; u32 inputAddressHi = inputAddress >> 32; u32 inputAddressLo = inputAddress & 0xFFFFFFFF; - UINT64 outputAddress = (Output) ?GetPhysicalAddress(Output) : 0; + u64 outputAddress = (Output) ?GetPhysicalAddress(Output) : 0; u32 outputAddressHi = outputAddress >> 32; u32 outputAddressLo = outputAddress & 0xFFFFFFFF; volatile void* hypercallPage = gHvContext.HypercallPage; @@ -208,9 +208,9 @@ HvDoHypercall ( __asm__ __volatile__ ("call *%8" : "=d"(hvStatusHi), "=a"(hvStatusLo) : "d" (controlHi), "a" (controlLo), "b" (inputAddressHi), "c" (inputAddressLo), "D"(outputAddressHi), "S"(outputAddressLo), "m" (hypercallPage)); - DPRINT_DBG(VMBUS, "Hypercall <return %llx>", hvStatusLo | ((UINT64)hvStatusHi << 32)); + DPRINT_DBG(VMBUS, "Hypercall <return %llx>", hvStatusLo | ((u64)hvStatusHi << 32)); - return (hvStatusLo | ((UINT64)hvStatusHi << 32)); + return (hvStatusLo | ((u64)hvStatusHi << 32)); #endif // x86_64 } @@ -401,7 +401,7 @@ HvPostMessage( ) { struct alignedInput { - UINT64 alignment8; + u64 alignment8; HV_INPUT_POST_MESSAGE msg; }; @@ -474,12 +474,12 @@ HvSynicInit ( u32 irqVector ) { - UINT64 version; + u64 version; HV_SYNIC_SIMP simp; HV_SYNIC_SIEFP siefp; HV_SYNIC_SINT sharedSint; HV_SYNIC_SCONTROL sctrl; - UINT64 guestID; + u64 guestID; int ret=0; DPRINT_ENTER(VMBUS); |