![]() | ||||||||||
Messages in this thread Patches in this message |
The attached 2 patches (against 2.6.14-rc2-rt3) seem to be required to compile dccp and nfnetlink (only compile-tested). Ingo Molnar wrote: > i have released the 2.6.14-rc2-rt2 tree, which can be downloaded from > the usual place: > > http://redhat.com/~mingo/realtime-preempt/ > ... --- linux-2.6.x/net/netfilter/nfnetlink_queue.c 2005-09-13 10:48:26.000000000 +0300 +++ linux-2.6.x-RT/net/netfilter/nfnetlink_queue.c 2005-09-27 08:20:10.000000000 +0300 @@ -149,7 +149,7 @@ atomic_set(&inst->id_sequence, 0); /* needs to be two, since we _put() after creation */ atomic_set(&inst->use, 2); - inst->lock = SPIN_LOCK_UNLOCKED; + inst->lock = SPIN_LOCK_UNLOCKED(inst->lock); INIT_LIST_HEAD(&inst->queue_list); if (!try_module_get(THIS_MODULE)) --- linux-2.6.x/net/netfilter/nfnetlink_log.c 2005-09-13 10:48:25.000000000 +0300 +++ linux-2.6.x-RT/net/netfilter/nfnetlink_log.c 2005-09-27 08:50:58.000000000 +0300 @@ -152,7 +152,7 @@ memset(inst, 0, sizeof(*inst)); INIT_HLIST_NODE(&inst->hlist); - inst->lock = SPIN_LOCK_UNLOCKED; + inst->lock = SPIN_LOCK_UNLOCKED(inst->lock); /* needs to be two, since we _put() after creation */ atomic_set(&inst->use, 2); --- linux-2.6.x/net/dccp/ipv4.c 2005-09-25 15:49:57.000000000 +0300 +++ linux-2.6.x-RT/net/dccp/ipv4.c 2005-09-26 15:06:02.000000000 +0300 @@ -28,10 +28,10 @@ #include "dccp.h" struct inet_hashinfo __cacheline_aligned dccp_hashinfo = { - .lhash_lock = RW_LOCK_UNLOCKED, + .lhash_lock = RW_LOCK_UNLOCKED(dccp_hashinfo.lhash_lock), .lhash_users = ATOMIC_INIT(0), .lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait), - .portalloc_lock = SPIN_LOCK_UNLOCKED, + .portalloc_lock = SPIN_LOCK_UNLOCKED(dccp_hashinfo.portalloc_lock), .port_rover = 1024 - 1, }; --- linux-2.6.x/net/dccp/minisocks.c 2005-09-25 15:49:57.000000000 +0300 +++ linux-2.6.x-RT/net/dccp/minisocks.c 2005-09-26 15:07:41.000000000 +0300 @@ -26,7 +26,7 @@ struct inet_timewait_death_row dccp_death_row = { .sysctl_max_tw_buckets = NR_FILE * 2, .period = DCCP_TIMEWAIT_LEN / INET_TWDR_TWKILL_SLOTS, - .death_lock = SPIN_LOCK_UNLOCKED, + .death_lock = SPIN_LOCK_UNLOCKED(dccp_death_row.death_lock), .hashinfo = &dccp_hashinfo, .tw_timer = TIMER_INITIALIZER(inet_twdr_hangman, 0, (unsigned long)&dccp_death_row), | |||||||||
| Last update: 2005-09-27 06:13 [from the cache] ©2003-2008 | ||||||||||