vserver 1.9.5.x5

[linux-2.6.git] / arch / ppc64 / kernel / viopath.c

diff --git a/arch/ppc64/kernel/viopath.c b/arch/ppc64/kernel/viopath.c
index 66a8102..74f185e 100644 (file)
--- a/arch/ppc64/kernel/viopath.c
+++ b/arch/ppc64/kernel/viopath.c
@@ -64,7 +64,7 @@ static struct viopathStatus {
        int numberAllocated;
 } viopathStatus[HVMAXARCHITECTEDLPS];
 
-static spinlock_t statuslock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(statuslock);
 
 /*
  * For each kind of event we allocate a buffer that is
@@ -473,7 +473,7 @@ static int allocateEvents(HvLpIndex remoteLp, int numEvents)
                parms.used_wait_atomic = 0;
                parms.sem = &Semaphore;
        }
-       mf_allocateLpEvents(remoteLp, HvLpEvent_Type_VirtualIo, 250,    /* It would be nice to put a real number here! */
+       mf_allocate_lp_events(remoteLp, HvLpEvent_Type_VirtualIo, 250,  /* It would be nice to put a real number here! */
                            numEvents, &viopath_donealloc, &parms);
        if (in_atomic()) {
                while (atomic_read(&wait_atomic))
@@ -582,7 +582,7 @@ int viopath_close(HvLpIndex remoteLp, int subtype, int numReq)
 
        doneAllocParms.used_wait_atomic = 0;
        doneAllocParms.sem = &Semaphore;
-       mf_deallocateLpEvents(remoteLp, HvLpEvent_Type_VirtualIo,
+       mf_deallocate_lp_events(remoteLp, HvLpEvent_Type_VirtualIo,
                              numReq, &viopath_donealloc, &doneAllocParms);
        down(&Semaphore);