# HG changeset patch # User Christopher Rogers # Date 1296404660 0 # Node ID ad6487ac4314f8db072a8d1f57c1c3f653d3a2a2 # Parent ab563b6b9645ffca7743ac5f296f11caee2a473f Fixed linmodem-intel-536ep and linmodem-intel-537. diff -r ab563b6b9645 -r ad6487ac4314 linmodem-intel-536ep/receipt --- a/linmodem-intel-536ep/receipt Sun Jan 30 16:09:14 2011 +0000 +++ b/linmodem-intel-536ep/receipt Sun Jan 30 16:24:20 2011 +0000 @@ -25,6 +25,8 @@ touch done.$file done < + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) +- #include ++ #include + #else + #include + #endif diff -r ab563b6b9645 -r ad6487ac4314 linmodem-intel-536ep/stuff/linmodem-intel-536ep-kernel-2.6.37.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/linmodem-intel-536ep/stuff/linmodem-intel-536ep-kernel-2.6.37.patch Sun Jan 30 16:24:20 2011 +0000 @@ -0,0 +1,49 @@ +--- coredrv/locks.c~ 2011-01-26 12:12:00.856675530 +0000 ++++ coredrv/locks.c 2011-01-26 12:12:00.873342198 +0000 +@@ -141,15 +141,15 @@ + #endif + } + +-DECLARE_MUTEX(sem0); +-DECLARE_MUTEX(sem1); +-DECLARE_MUTEX(sem2); +-DECLARE_MUTEX(sem3); +-DECLARE_MUTEX(sem4); +-DECLARE_MUTEX(sem5); +-DECLARE_MUTEX(sem6); +-DECLARE_MUTEX(sem7); +-DECLARE_MUTEX(sem8); ++DEFINE_SEMAPHORE(sem0); ++DEFINE_SEMAPHORE(sem1); ++DEFINE_SEMAPHORE(sem2); ++DEFINE_SEMAPHORE(sem3); ++DEFINE_SEMAPHORE(sem4); ++DEFINE_SEMAPHORE(sem5); ++DEFINE_SEMAPHORE(sem6); ++DEFINE_SEMAPHORE(sem7); ++DEFINE_SEMAPHORE(sem8); + + asmlinkage void linux_RSAGetExclusive(int Resource, unsigned char *Indicator) + { +--- coredrv/softserial_io.c~ 2011-01-26 12:16:55.753342197 +0000 ++++ coredrv/softserial_io.c 2011-01-26 12:16:55.763342199 +0000 +@@ -65,7 +65,7 @@ + } + + //============================================================================= +-static DECLARE_MUTEX(softserial_write_sem); ++static DEFINE_SEMAPHORE(softserial_write_sem); + int softserial_write(struct tty_struct* ptty, + //int from_user_space, + const unsigned char* input_buffer, +--- coredrv/coredrv.c~ 2011-01-26 12:15:54.713342038 +0000 ++++ coredrv/coredrv.c 2011-01-26 12:15:54.726675572 +0000 +@@ -765,7 +765,7 @@ + extern void do_schedule(void); + #endif + +- DECLARE_MUTEX(exec_reg_sem); ++ DEFINE_SEMAPHORE(exec_reg_sem); + DECLARE_WAIT_QUEUE_HEAD(persistWriteQ); + DECLARE_WAIT_QUEUE_HEAD(persistReadQ); + DECLARE_WAIT_QUEUE_HEAD(persistShutdownQ); diff -r ab563b6b9645 -r ad6487ac4314 linmodem-intel-537/receipt --- a/linmodem-intel-537/receipt Sun Jan 30 16:09:14 2011 +0000 +++ b/linmodem-intel-537/receipt Sun Jan 30 16:24:20 2011 +0000 @@ -25,6 +25,8 @@ touch done.$file done < + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) +- #include ++ #include + #else + #include + #endif diff -r ab563b6b9645 -r ad6487ac4314 linmodem-intel-537/stuff/linmodem-intel-537-kernel-2.6.37.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/linmodem-intel-537/stuff/linmodem-intel-537-kernel-2.6.37.patch Sun Jan 30 16:24:20 2011 +0000 @@ -0,0 +1,49 @@ +--- coredrv/locks.c~ 2011-01-26 12:12:00.856675530 +0000 ++++ coredrv/locks.c 2011-01-26 12:12:00.873342198 +0000 +@@ -141,15 +141,15 @@ + #endif + } + +-DECLARE_MUTEX(sem0); +-DECLARE_MUTEX(sem1); +-DECLARE_MUTEX(sem2); +-DECLARE_MUTEX(sem3); +-DECLARE_MUTEX(sem4); +-DECLARE_MUTEX(sem5); +-DECLARE_MUTEX(sem6); +-DECLARE_MUTEX(sem7); +-DECLARE_MUTEX(sem8); ++DEFINE_SEMAPHORE(sem0); ++DEFINE_SEMAPHORE(sem1); ++DEFINE_SEMAPHORE(sem2); ++DEFINE_SEMAPHORE(sem3); ++DEFINE_SEMAPHORE(sem4); ++DEFINE_SEMAPHORE(sem5); ++DEFINE_SEMAPHORE(sem6); ++DEFINE_SEMAPHORE(sem7); ++DEFINE_SEMAPHORE(sem8); + + asmlinkage void linux_RSAGetExclusive(int Resource, unsigned char *Indicator) + { +--- coredrv/softserial_io.c~ 2011-01-26 12:16:55.753342197 +0000 ++++ coredrv/softserial_io.c 2011-01-26 12:16:55.763342199 +0000 +@@ -65,7 +65,7 @@ + } + + //============================================================================= +-static DECLARE_MUTEX(softserial_write_sem); ++static DEFINE_SEMAPHORE(softserial_write_sem); + int softserial_write(struct tty_struct* ptty, + //int from_user_space, + const unsigned char* input_buffer, +--- coredrv/coredrv.c~ 2011-01-26 12:15:54.713342038 +0000 ++++ coredrv/coredrv.c 2011-01-26 12:15:54.726675572 +0000 +@@ -765,7 +765,7 @@ + extern void do_schedule(void); + #endif + +- DECLARE_MUTEX(exec_reg_sem); ++ DEFINE_SEMAPHORE(exec_reg_sem); + DECLARE_WAIT_QUEUE_HEAD(persistWriteQ); + DECLARE_WAIT_QUEUE_HEAD(persistReadQ); + DECLARE_WAIT_QUEUE_HEAD(persistShutdownQ);