summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Freise <dennis.freise@final-frontier.org>2011-09-04 21:17:44 +0200
committerDennis Freise <dennis.freise@final-frontier.org>2011-09-04 21:17:44 +0200
commit3960246760b93e2e027c49012f0c7d29f8955011 (patch)
tree11d991482a6a9e73801c96ff5fc329a4c4635832
parentPatch for amd64-sources by Arnd Feldmueller added, ebuild fcpci-0.1-r6 (diff)
downloaddfreise-3960246760b93e2e027c49012f0c7d29f8955011.tar.gz
dfreise-3960246760b93e2e027c49012f0c7d29f8955011.tar.bz2
dfreise-3960246760b93e2e027c49012f0c7d29f8955011.zip
Converted fcpci-kernel-2.6.39-amd64.patch from MSDOS to UNIX line-endings
-rw-r--r--net-dialup/fcpci/Manifest2
-rw-r--r--net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch106
2 files changed, 54 insertions, 54 deletions
diff --git a/net-dialup/fcpci/Manifest b/net-dialup/fcpci/Manifest
index e5e4c8b..047786a 100644
--- a/net-dialup/fcpci/Manifest
+++ b/net-dialup/fcpci/Manifest
@@ -1,5 +1,5 @@
AUX fcpci-kernel-2.6.34.patch 4358 RMD160 63ba14a64be689ac4f15cfe010106a9a3c4e7c41 SHA1 8b53b1a43cb5615995502239a40687d61443a27c SHA256 82f72dda3f5a6956e5e35990e0b431ff11c8f9a4f046f991d19aca95d79dfd6e
-AUX fcpci-kernel-2.6.39-amd64.patch 1716 RMD160 df5a10616b8200805448b4a2b55beb0193dc3650 SHA1 6b0b82b13a37c14323edecd1bc21305c6877d057 SHA256 e70d51393b7096ad20e56c0c995277294ca009fbeaa7662c6378670290179510
+AUX fcpci-kernel-2.6.39-amd64.patch 1663 RMD160 3c893fea87fafdca47dc2f9626cceefd0a94a057 SHA1 11c3b0f852b27e4ff0177c402de2d184cfdb16e4 SHA256 5170d808807897319d85ed035c170d672df81ee505e795ee0b31d2fc4a9359e1
AUX fcpci-kernel-2.6.39.patch 850 RMD160 d6f8573a5aa8b15fce6ee8096e20d23ca3032397 SHA1 cb67c68483a0c71e1b5800c7c76bbe415522dda2 SHA256 9f56ee45159365216fd58b1d76ce878fd4db2eee456c04354c56330db7a257d6
AUX kernel-2.6.34.patch 4515 RMD160 679ad014f799d9bf9f13c1aa1fd6451faebc5bc8 SHA1 d5c94106b43f9f4371274efe47aaeb6e4347fce7 SHA256 94e83fad32998596f97d7f5df3e9c674419616a3bcfb3cb7309c220204ac0de7
AUX kernel-2.6.39.patch 810 RMD160 811e597fa65a65a4aa59eb176f5e95b401b9124c SHA1 edb7f9e66331997a52023f6fb6c5ab9a3e762f45 SHA256 5ceb47f364064b11d8ed12f73cf6cbaf22b53cd5f9109d7b1beb7943620bc2af
diff --git a/net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch b/net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch
index 25045b0..10e36e2 100644
--- a/net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch
+++ b/net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch
@@ -1,53 +1,53 @@
---- fritz/src/driver.c_orig 2011-09-04 16:54:30.000000000 +0200
-+++ fritz/src/driver.c 2011-09-04 16:55:02.000000000 +0200
-@@ -101,7 +101,8 @@
- static unsigned long crit_flags;
- static atomic_t scheduler_enabled = ATOMIC_INIT (0);
- static atomic_t scheduler_id = ATOMIC_INIT (-1);
--static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
-+//static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(sched_lock);
- #if !defined (__fcclassic__)
- static int card_id = 0;
- #endif
-@@ -815,7 +816,7 @@
-
- UNUSED_ARG (data);
- atomic_set (&scheduler_id, smp_processor_id ());
-- if (spin_trylock (&stack_lock)) {
-+ if (spin_trylock (&sched_lock)) {
- while (!atomic_read (&dont_sched)) {
- atomic_set (&dont_sched, 1);
- os_timer_poll ();
-@@ -823,7 +824,7 @@
- scheduler_control (TRUE);
- }
- }
-- spin_unlock (&stack_lock);
-+ spin_unlock (&sched_lock);
- }
- atomic_set (&scheduler_id, -1);
- } /* scheduler */
-@@ -839,9 +840,9 @@
- if (atomic_read (&scheduler_id) == smp_processor_id ()) {
- res = IRQ_RETVAL ((*capi_lib->cm_handle_events) ());
- } else {
-- spin_lock (&stack_lock);
-+ spin_lock (&sched_lock);
- res = IRQ_RETVAL ((*capi_lib->cm_handle_events) ());
-- spin_unlock (&stack_lock);
-+ spin_unlock (&sched_lock);
- }
- if (res == IRQ_HANDLED) {
- atomic_set (&dont_sched, 0);
---- fritz/src/tools.c_orig 2011-09-04 16:54:36.000000000 +0200
-+++ fritz/src/tools.c 2011-09-04 16:55:06.000000000 +0200
-@@ -529,7 +529,7 @@
- ERROR("Could not allocate lock structure!!!\n");
- return 0;
- }
-- tmp->lock = SPIN_LOCK_UNLOCKED;
-+ spin_lock_init(&tmp->lock);
- *plock = tmp;
- return 1;
- } /* lock_init */
+--- fritz/src/driver.c_orig 2011-09-04 16:54:30.000000000 +0200
++++ fritz/src/driver.c 2011-09-04 16:55:02.000000000 +0200
+@@ -101,7 +101,8 @@
+ static unsigned long crit_flags;
+ static atomic_t scheduler_enabled = ATOMIC_INIT (0);
+ static atomic_t scheduler_id = ATOMIC_INIT (-1);
+-static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
++//static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(sched_lock);
+ #if !defined (__fcclassic__)
+ static int card_id = 0;
+ #endif
+@@ -815,7 +816,7 @@
+
+ UNUSED_ARG (data);
+ atomic_set (&scheduler_id, smp_processor_id ());
+- if (spin_trylock (&stack_lock)) {
++ if (spin_trylock (&sched_lock)) {
+ while (!atomic_read (&dont_sched)) {
+ atomic_set (&dont_sched, 1);
+ os_timer_poll ();
+@@ -823,7 +824,7 @@
+ scheduler_control (TRUE);
+ }
+ }
+- spin_unlock (&stack_lock);
++ spin_unlock (&sched_lock);
+ }
+ atomic_set (&scheduler_id, -1);
+ } /* scheduler */
+@@ -839,9 +840,9 @@
+ if (atomic_read (&scheduler_id) == smp_processor_id ()) {
+ res = IRQ_RETVAL ((*capi_lib->cm_handle_events) ());
+ } else {
+- spin_lock (&stack_lock);
++ spin_lock (&sched_lock);
+ res = IRQ_RETVAL ((*capi_lib->cm_handle_events) ());
+- spin_unlock (&stack_lock);
++ spin_unlock (&sched_lock);
+ }
+ if (res == IRQ_HANDLED) {
+ atomic_set (&dont_sched, 0);
+--- fritz/src/tools.c_orig 2011-09-04 16:54:36.000000000 +0200
++++ fritz/src/tools.c 2011-09-04 16:55:06.000000000 +0200
+@@ -529,7 +529,7 @@
+ ERROR("Could not allocate lock structure!!!\n");
+ return 0;
+ }
+- tmp->lock = SPIN_LOCK_UNLOCKED;
++ spin_lock_init(&tmp->lock);
+ *plock = tmp;
+ return 1;
+ } /* lock_init */