SPECS (LINUX_2_6): kernel.spec - fix realtime-preempt locks.

[pluto]

Author: pluto                        Date: Mon Oct 31 15:42:46 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- fix realtime-preempt locks.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1271 -> 1.441.2.1272) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1271 SPECS/kernel.spec:1.441.2.1272
--- SPECS/kernel.spec:1.441.2.1271	Sun Oct 30 15:40:58 2005
+++ SPECS/kernel.spec	Mon Oct 31 16:42:40 2005
@@ -735,10 +735,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%if %{with preemptive}
-sed -i 's:SPIN_LOCK_UNLOCKED:SPIN_LOCK_UNLOCKED(dev_lock):' net/ipv4/netfilter/nf-hipac/nfhp_dev.c
-sed -i 's:RW_LOCK_UNLOCKED:RW_LOCK_UNLOCKED(data->lock):' net/ipv4/netfilter/nf-hipac/nfhp_proc.c
-%endif
 %patch9 -p0
 %patch10 -p1
 #patch11 -p1		NEEDS CHECK (compilation error)
@@ -803,7 +799,6 @@
 %patch80 -p1
 
 %patch82 -p1
-%{?with_preemptive:sed -i 's:SPIN_LOCK_UNLOCKED:SPIN_LOCK_UNLOCKED(SendCmplPktQ.QueueLock):' drivers/net/sk98lin/sky2.c}
 %patch83 -p1
 %patch84 -p1
 %patch86 -p1
@@ -870,6 +865,25 @@
 # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build
 sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
 
+%if %{with xpreemptive}
+sed -i 's:SPIN_LOCK_UNLOCKED:SPIN_LOCK_UNLOCKED(SendCmplPktQ.QueueLock):' drivers/net/sk98lin/sky2.c
+for f in \
+	net/ipv4/netfilter/ip_set.c \
+	net/ipv4/netfilter/ipt_account.c \
+	net/ipv4/netfilter/ipt_expire.c \
+	net/ipv4/netfilter/ipt_fuzzy.c \
+	net/ipv4/netfilter/ipt_geoip.c \
+	net/ipv4/netfilter/ipt_osf.c \
+	net/ipv4/netfilter/ipt_quota.c \
+	net/ipv4/netfilter/nf-hipac/nfhp_dev.c \
+	net/ipv4/netfilter/nf-hipac/nfhp_proc.c \
+	net/ipv6/netfilter/ip6t_expire.c \
+	net/ipv6/netfilter/ip6t_fuzzy.c \
+; do
+	perl -pi -e 's/(.*\s+(.*)\s+=\s+\w+_LOCK_UNLOCKED)\s*;/$1\($2\);/' $f
+done
+%endif
+
 %build
 TuneUpConfigForIX86 () {
 %ifarch %{ix86}
@@ -1679,6 +1693,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1272  2005/10/31 15:42:40  pluto
+- fix realtime-preempt locks.
+
 Revision 1.441.2.1271  2005/10/30 14:40:58  pluto
 - nf build fixes, rt1, release 0.1.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1271&r2=1.441.2.1272&f=u