Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354994
b: refs/heads/master
c: 9acd644
h: refs/heads/master
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Jan 17, 2013
1 parent f7eac2e commit 967dcf5
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 33 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: a119845f6e98c890831bb5639cdad5ca9b79965f
refs/heads/master: 9acd6442c6839d404c1f47dc0f3ff3e0fb13e44c
24 changes: 0 additions & 24 deletions trunk/drivers/hv/hv.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
struct hv_context hv_context = {
.synic_initialized = false,
.hypercall_page = NULL,
.signal_event_param = NULL,
.signal_event_buffer = NULL,
};

/*
Expand Down Expand Up @@ -170,24 +168,6 @@ int hv_init(void)

hv_context.hypercall_page = virtaddr;

/* Setup the global signal event param for the signal event hypercall */
hv_context.signal_event_buffer =
kmalloc(sizeof(struct hv_input_signal_event_buffer),
GFP_KERNEL);
if (!hv_context.signal_event_buffer)
goto cleanup;

hv_context.signal_event_param =
(struct hv_input_signal_event *)
(ALIGN((unsigned long)
hv_context.signal_event_buffer,
HV_HYPERCALL_PARAM_ALIGN));
hv_context.signal_event_param->connectionid.asu32 = 0;
hv_context.signal_event_param->connectionid.u.id =
VMBUS_EVENT_CONNECTION_ID;
hv_context.signal_event_param->flag_number = 0;
hv_context.signal_event_param->rsvdz = 0;

return 0;

cleanup:
Expand Down Expand Up @@ -215,10 +195,6 @@ void hv_cleanup(void)
/* Reset our OS id */
wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);

kfree(hv_context.signal_event_buffer);
hv_context.signal_event_buffer = NULL;
hv_context.signal_event_param = NULL;

if (hv_context.hypercall_page) {
hypercall_msr.as_uint64 = 0;
wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
Expand Down
8 changes: 0 additions & 8 deletions trunk/drivers/hv/hyperv_vmbus.h
Original file line number Diff line number Diff line change
Expand Up @@ -492,14 +492,6 @@ struct hv_context {

bool synic_initialized;

/*
* 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). */
struct hv_input_signal_event_buffer *signal_event_buffer;
/* 8-bytes aligned of the buffer above */
struct hv_input_signal_event *signal_event_param;

void *synic_message_page[NR_CPUS];
void *synic_event_page[NR_CPUS];
/*
Expand Down

0 comments on commit 967dcf5

Please sign in to comment.