X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2FLINUX%2Fosi_sleep.c;h=dd45ee3314eed6ce0995daa45aed54d8b177a077;hp=433c82ba52a8ab270641c46d0f436b04ec056c7d;hb=109927bf6f54b58b76ac48ba41c2012c74937fed;hpb=b7cc8bf2850c5650a9e47416af8bd488f9be9161

diff --git a/src/afs/LINUX/osi_sleep.c b/src/afs/LINUX/osi_sleep.c
index 433c82b..dd45ee3 100644
--- a/src/afs/LINUX/osi_sleep.c
+++ b/src/afs/LINUX/osi_sleep.c
@@ -82,11 +82,7 @@ typedef struct afs_event {
     int seq;			/* Sequence number: this is incremented
 				 * by wakeup calls; wait will not return until
 				 * it changes */
-#if defined(AFS_LINUX24_ENV)
     wait_queue_head_t cond;
-#else
-    struct wait_queue *cond;
-#endif
 } afs_event_t;
 
 #define HASHSIZE 128
@@ -146,11 +142,7 @@ afs_addevent(char *event)
     afs_evhashcnt++;
     newp->next = afs_evhasht[hashcode];
     afs_evhasht[hashcode] = newp;
-#if defined(AFS_LINUX24_ENV)
     init_waitqueue_head(&newp->cond);
-#else
-    init_waitqueue(&newp->cond);
-#endif
     newp->seq = 0;
     newp->event = &dummyV;	/* Dummy address for new events */
     newp->refcount = 0;
@@ -194,7 +186,6 @@ afs_osi_SleepSig(void *event)
 	AFS_ASSERT_GLOCK();
 	AFS_GUNLOCK();
 	schedule();
-#ifdef AFS_LINUX26_ENV
 #ifdef CONFIG_PM
 	if (
 #ifdef PF_FREEZE
@@ -217,7 +208,6 @@ afs_osi_SleepSig(void *event)
 	    refrigerator();
 #endif
 #endif
-#endif
 	AFS_GLOCK();
 	if (signal_pending(current)) {
 	    retval = EINTR;
@@ -296,7 +286,6 @@ osi_TimedSleep(char *event, afs_int32 ams, int aintok)
 	    code = EINTR;
     } else
 	schedule_timeout(ticks);
-#ifdef AFS_LINUX26_ENV
 #ifdef CONFIG_PM
     if (
 #ifdef PF_FREEZE
@@ -319,7 +308,6 @@ osi_TimedSleep(char *event, afs_int32 ams, int aintok)
 	refrigerator();
 #endif
 #endif
-#endif
 
     AFS_GLOCK();
     remove_wait_queue(&evp->cond, &wait);