From 979750b9f8311b2b0baa3769b842ff675533d2b2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 29 Jul 2009 15:42:27 -0700
Subject: [PATCH] --- yaml --- r: 162187 b: refs/heads/master c:
 45dcfb3809fda1f40f10a0650518a0320974caee h: refs/heads/master i:   162185:
 8411b9908ee5b550c55d9a975bc239887833421d   162183:
 64518bce64418bf3c8bceb972c7ecfc77042a1d2 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/staging/hv/Makefile | 6 +++---
 trunk/drivers/staging/hv/osd.c    | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 896314edb8d5..9ac24d2fa48c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8a429a465f9aaabe7fc7ddf5f34ff6dd188a68f
+refs/heads/master: 45dcfb3809fda1f40f10a0650518a0320974caee
diff --git a/trunk/drivers/staging/hv/Makefile b/trunk/drivers/staging/hv/Makefile
index d4142e2de038..f6ad6707b2ce 100644
--- a/trunk/drivers/staging/hv/Makefile
+++ b/trunk/drivers/staging/hv/Makefile
@@ -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
diff --git a/trunk/drivers/staging/hv/osd.c b/trunk/drivers/staging/hv/osd.c
index d39e7a0825ac..f2576958f642 100644
--- a/trunk/drivers/staging/hv/osd.c
+++ b/trunk/drivers/staging/hv/osd.c
@@ -79,6 +79,7 @@ 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)
 {
@@ -86,6 +87,7 @@ void osd_PageFree(void* page, unsigned int count)
 	/*struct page* p = virt_to_page(page);
 	__free_page(p);*/
 }
+EXPORT_SYMBOL_GPL(osd_PageFree);
 
 struct osd_waitevent *osd_WaitEventCreate(void)
 {
@@ -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)
 {
@@ -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)
 {
@@ -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)
 {