Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162187
b: refs/heads/master
c: 45dcfb3
h: refs/heads/master
i:
  162185: 8411b99
  162183: 64518bc
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent 4c128cd commit 979750b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 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: c8a429a465f9aaabe7fc7ddf5f34ff6dd188a68f
refs/heads/master: 45dcfb3809fda1f40f10a0650518a0320974caee
6 changes: 3 additions & 3 deletions trunk/drivers/staging/hv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ obj-$(CONFIG_HYPERV_BLOCK) += hv_blkvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o

hv_vmbus-objs := vmbus_drv.o osd.o Sources.o
hv_storvsc-objs := storvsc_drv.o osd.o StorVsc.o
hv_blkvsc-objs := blkvsc_drv.o osd.o BlkVsc.o
hv_netvsc-objs := netvsc_drv.o osd.o NetVsc.o RndisFilter.o
hv_storvsc-objs := storvsc_drv.o StorVsc.o
hv_blkvsc-objs := blkvsc_drv.o BlkVsc.o
hv_netvsc-objs := netvsc_drv.o NetVsc.o RndisFilter.o
6 changes: 6 additions & 0 deletions trunk/drivers/staging/hv/osd.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,15 @@ void *osd_PageAlloc(unsigned int count)
/* if (p) memset(p, 0, PAGE_SIZE); */
/* return p; */
}
EXPORT_SYMBOL_GPL(osd_PageAlloc);

void osd_PageFree(void* page, unsigned int count)
{
free_pages((unsigned long)page, get_order(count * PAGE_SIZE));
/*struct page* p = virt_to_page(page);
__free_page(p);*/
}
EXPORT_SYMBOL_GPL(osd_PageFree);

struct osd_waitevent *osd_WaitEventCreate(void)
{
Expand All @@ -99,12 +101,14 @@ struct osd_waitevent *osd_WaitEventCreate(void)
init_waitqueue_head(&wait->event);
return wait;
}
EXPORT_SYMBOL_GPL(osd_WaitEventCreate);

void osd_WaitEventSet(struct osd_waitevent *waitEvent)
{
waitEvent->condition = 1;
wake_up_interruptible(&waitEvent->event);
}
EXPORT_SYMBOL_GPL(osd_WaitEventSet);

int osd_WaitEventWait(struct osd_waitevent *waitEvent)
{
Expand All @@ -115,6 +119,7 @@ int osd_WaitEventWait(struct osd_waitevent *waitEvent)
waitEvent->condition = 0;
return ret;
}
EXPORT_SYMBOL_GPL(osd_WaitEventWait);

int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs)
{
Expand All @@ -126,6 +131,7 @@ int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs)
waitEvent->condition = 0;
return ret;
}
EXPORT_SYMBOL_GPL(osd_WaitEventWaitEx);

static void osd_callback_work(struct work_struct *work)
{
Expand Down

0 comments on commit 979750b

Please sign in to comment.