diff options
author | Stefan Briesenick <sbriesen@gentoo.org> | 2008-01-30 01:40:51 +0000 |
---|---|---|
committer | Stefan Briesenick <sbriesen@gentoo.org> | 2008-01-30 01:40:51 +0000 |
commit | 59d96ee34a6ba498446a3e36916f5f78f012839f (patch) | |
tree | a7d3ec721727ec1c1d495946de5c1cca2d2d27d8 /net-dialup/fcusb/files | |
parent | Marking gnustep ppc for bug 207381 (diff) | |
download | gentoo-2-59d96ee34a6ba498446a3e36916f5f78f012839f.tar.gz gentoo-2-59d96ee34a6ba498446a3e36916f5f78f012839f.tar.bz2 gentoo-2-59d96ee34a6ba498446a3e36916f5f78f012839f.zip |
fixing string.h problem (see bug #202385) + patches for kernel 2.6.24 (thanks to Arnd Feldmueller <arnd.feldmueller@web.de>).
(Portage version: 2.1.4)
Diffstat (limited to 'net-dialup/fcusb/files')
-rw-r--r-- | net-dialup/fcusb/files/digest-fcusb-0.1-r1 | 3 | ||||
-rw-r--r-- | net-dialup/fcusb/files/fcusb_kernel-2.6.24.diff | 46 |
2 files changed, 49 insertions, 0 deletions
diff --git a/net-dialup/fcusb/files/digest-fcusb-0.1-r1 b/net-dialup/fcusb/files/digest-fcusb-0.1-r1 new file mode 100644 index 000000000000..ce870b35b99c --- /dev/null +++ b/net-dialup/fcusb/files/digest-fcusb-0.1-r1 @@ -0,0 +1,3 @@ +MD5 9a799fe74233d5a2f782149a55d400af fcusb-0.1-0.src.rpm 806590 +RMD160 4d418992ba199349f6868804555e4dbf09c1b0d8 fcusb-0.1-0.src.rpm 806590 +SHA256 f5d74c7c0366bb4bb8460fb38ea8ffb538c4092a62018ccbcc8be132ef19cbb0 fcusb-0.1-0.src.rpm 806590 diff --git a/net-dialup/fcusb/files/fcusb_kernel-2.6.24.diff b/net-dialup/fcusb/files/fcusb_kernel-2.6.24.diff new file mode 100644 index 000000000000..06e85138e16c --- /dev/null +++ b/net-dialup/fcusb/files/fcusb_kernel-2.6.24.diff @@ -0,0 +1,46 @@ +--- src/driver.c.orig 2008-01-30 01:53:11.000000000 +0100 ++++ src/driver.c 2008-01-30 01:54:06.000000000 +0100 +@@ -92,8 +92,12 @@ + static DECLARE_WAIT_QUEUE_HEAD(capi_wait); + static DECLARE_WAIT_QUEUE_HEAD(tx_wait); + static DECLARE_WAIT_QUEUE_HEAD(rx_wait); ++static DECLARE_COMPLETION(hotplug); /* New DECLARE, <arnd.feldmueller@web.de> */ ++static DECLARE_COMPLETION(notify); /* New DECLARE, <arnd.feldmueller@web.de> */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) + static DECLARE_MUTEX_LOCKED(hotplug); + static DECLARE_MUTEX_LOCKED(notify); ++#endif + + #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } + #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } +@@ -787,7 +791,7 @@ + close_func = func; + close_data = data; + +- INIT_WORK (&closing_work, closing_worker); ++ INIT_WORK (&closing_work, (work_func_t)closing_worker); + schedule_work (&closing_work); + LOG("Worker scheduled.\n"); + } /* start_closing_worker */ +@@ -1211,7 +1215,10 @@ + } + } + LOG("Scheduler thread stopped.\n"); ++ complete(&hotplug); /* Complete Thread Sync here <arnd.feldmueller@web.de> */ ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) + up (&hotplug); ++ #endif + return 0; + } /* scheduler */ + +@@ -1246,7 +1253,10 @@ + SCHED_WAKEUP; + } + LOG("Scheduler thread signalled, waiting...\n"); ++ wait_for_completion(&hotplug); /* Wait for complete Thread Sync <arnd.feldmueller@web.de> */ ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) + down (&hotplug); ++ #endif + LOG("Scheduler thread[%d] terminated.\n", thread_pid); + } + thread_pid = -1; |