Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162202
b: refs/heads/master
c: af248e1
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent d789f43 commit 9a04829
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6ddf5a789653175350745debeb92b7c018daef22
refs/heads/master: af248e1f1283792e95fd9842fe343f9260300c9d
12 changes: 6 additions & 6 deletions trunk/drivers/staging/hv/Hv.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
/* Globals */

/* The one and only */
HV_CONTEXT gHvContext={
.SynICInitialized = false,
.HypercallPage = NULL,
.SignalEventParam = NULL,
.SignalEventBuffer = NULL,
struct hv_context gHvContext = {
.SynICInitialized = false,
.HypercallPage = NULL,
.SignalEventParam = NULL,
.SignalEventBuffer = NULL,
};


Expand Down Expand Up @@ -299,7 +299,7 @@ int HvInit (void)
(u64)hypercallMsr.GuestPhysicalAddress << PAGE_SHIFT);

/* Setup the global signal event param for the signal event hypercall */
gHvContext.SignalEventBuffer = kmalloc(sizeof(HV_INPUT_SIGNAL_EVENT_BUFFER), GFP_KERNEL);
gHvContext.SignalEventBuffer = kmalloc(sizeof(struct hv_input_signal_event_buffer), GFP_KERNEL);
if (!gHvContext.SignalEventBuffer)
{
goto Cleanup;
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/staging/hv/Hv.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ static const GUID VMBUS_SERVICE_ID = {
#define MAX_NUM_CPUS 1


typedef struct {
struct hv_input_signal_event_buffer {
u64 Align8;
HV_INPUT_SIGNAL_EVENT Event;
} HV_INPUT_SIGNAL_EVENT_BUFFER;
};

typedef struct {
struct hv_context {
/* XenLinux or native Linux. If XenLinux, the hypercall and synic pages
* has already been initialized */
u64 GuestId;
Expand All @@ -122,15 +122,15 @@ typedef struct {
* This is used as an input param to HvCallSignalEvent hypercall. The
* input param is immutable in our usage and must be dynamic mem (vs
* stack or global). */
HV_INPUT_SIGNAL_EVENT_BUFFER *SignalEventBuffer;
struct hv_input_signal_event_buffer *SignalEventBuffer;
/* 8-bytes aligned of the buffer above */
HV_INPUT_SIGNAL_EVENT *SignalEventParam;

void *synICMessagePage[MAX_NUM_CPUS];
void *synICEventPage[MAX_NUM_CPUS];
} HV_CONTEXT;
};

extern HV_CONTEXT gHvContext;
extern struct hv_context gHvContext;


/* Hv Interface */
Expand Down

0 comments on commit 9a04829

Please sign in to comment.