[patch] patch to fcdsl2_kernel-2.6.24.diff

fcdsl2_symbol_clash.diff (text/plain), 1.50 KB, created by j.habenicht on 2008-05-11 09:56:11 UTC

--- src/driver.c.orig	2008-05-06 15:58:30.000000000 +0200
+++ src/driver.c	2008-05-11 10:13:16.000000000 +0200
@@ -116,9 +116,9 @@
 static DECLARE_WAIT_QUEUE_HEAD(capi_wait);
 static DECLARE_WAIT_QUEUE_HEAD(dbg_wait);
 
-static DECLARE_COMPLETION(thread_sync); /* New DECLARE, <[e-mail]> */
+static DECLARE_COMPLETION(thread_sync_completion); /* New DECLARE, <[e-mail]> */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
-static DECLARE_MUTEX_LOCKED(thread_sync);
+static DECLARE_MUTEX_LOCKED(thread_sync_mutex);
 #endif
 
 #define SCHED_WAKEUP_CAPI       { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); }
@@ -1408,9 +1408,9 @@
 		}
 	}
 	LOG("Scheduler thread stopped.\n");
-	complete(&thread_sync); /* Complete Thread Sync here <[e-mail]> */
+	complete(&thread_sync_completion); /* Complete Thread Sync here <[e-mail]> */
 	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
-	up (&thread_sync);
+	up (&thread_sync_mutex);
 	#endif
 	return 0;
 } /* sched_thread */
@@ -1445,9 +1445,9 @@
 			SCHED_WAKEUP;
 		}
 		LOG("Thread signalled, waiting for termination...\n");
-		wait_for_completion(&thread_sync); /* Wait for complete Thread Sync <[e-mail]> */
+		wait_for_completion(&thread_sync_completion); /* Wait for complete Thread Sync <[e-mail]> */
 		#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
-		down (&thread_sync);
+		down (&thread_sync_mutex);
 		#endif
 		LOG("Thread[%d] terminated.\n", thread_pid);
 	}