From bfc30aae73b6be57528059a9e03ce8674320e67b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Jul 2009 15:40:18 -0700 Subject: Staging: hv: osd: add osd_ prefix to global functions Put a "osd_" prefix on the osd.c functions in order for us to play nicer in the kernel namespace. Cc: Bill Pemberton Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/include/osd.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'drivers/staging/hv/include') diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index 58c47a7..756202c 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -68,25 +68,22 @@ struct osd_timer { /* Osd routines */ -extern void* VirtualAllocExec(unsigned int size); +extern void *osd_VirtualAllocExec(unsigned int size); -extern void* PageAlloc(unsigned int count); -extern void PageFree(void* page, unsigned int count); +extern void *osd_PageAlloc(unsigned int count); +extern void osd_PageFree(void* page, unsigned int count); -extern void* MemMapIO(unsigned long phys, unsigned long size); -extern void MemUnmapIO(void* virt); +extern struct osd_timer *osd_TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context); +extern void osd_TimerClose(struct osd_timer *t); +extern int osd_TimerStop(struct osd_timer *t); +extern void osd_TimerStart(struct osd_timer *t, u32 expirationInUs); -extern struct osd_timer *TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context); -extern void TimerClose(struct osd_timer *t); -extern int TimerStop(struct osd_timer *t); -extern void TimerStart(struct osd_timer *t, u32 expirationInUs); - -extern struct osd_waitevent *WaitEventCreate(void); -extern void WaitEventSet(struct osd_waitevent *waitEvent); -extern int WaitEventWait(struct osd_waitevent *waitEvent); +extern struct osd_waitevent *osd_WaitEventCreate(void); +extern void osd_WaitEventSet(struct osd_waitevent *waitEvent); +extern int osd_WaitEventWait(struct osd_waitevent *waitEvent); /* If >0, waitEvent got signaled. If ==0, timeout. If < 0, error */ -extern int WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs); +extern int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs); int osd_schedule_callback(struct workqueue_struct *wq, -- cgit v1.1