SPECS (LINUX_2_6): kernel.spec - realtime preemptive updated and p...

[sparky]

Author: sparky                       Date: Sun Feb 19 21:16:19 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- realtime preemptive updated and partially fixed

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1402 -> 1.441.2.1403) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1402 SPECS/kernel.spec:1.441.2.1403
--- SPECS/kernel.spec:1.441.2.1402	Sun Feb 19 18:26:03 2006
+++ SPECS/kernel.spec	Sun Feb 19 22:16:14 2006
@@ -179,8 +179,8 @@
 Source2:	kernel-config.h
 #Source3:	http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.14%{_rc}-git2.bz2
 ## Source3-md5:	3db58f38e8a3c001d1a18eb1ee27db3b
-Source4:	http://people.redhat.com/mingo/realtime-preempt/older/patch-2.6.14-rt22
-# Source4-md5:	28a0817f6b12bf95758cf08995de348e
+Source4:	http://people.redhat.com/mingo/realtime-preempt/patch-2.6.15-rt16
+# Source4-md5:	554d73044e665022d052d2f9c782c750
 Source5:	kernel-ppclibs.Makefile
 Source6:	http://people.redhat.com/mingo/debloating-patches/debloating-patches-2.6.15-rc7.tar.gz
 # Source6-md5:	ca7a1cdef3e5c95f182d039cebd92b5e
@@ -776,8 +776,10 @@
 %prep
 %setup -q -n linux-%{version}%{_rc}
 #bzip2 -d -c %{SOURCE3} | patch -p1 -s
-#sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = #g' Makefile
-%{?with_preemptive:patch -p1 -s < %{SOURCE4}}
+%if %{with preemptive}
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION =#g' Makefile
+patch -p1 -s < %{SOURCE4}
+%endif
 install %{SOURCE5} Makefile.ppclibs
 
 %if 0
@@ -809,9 +811,9 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
+%{!?with_preemptive:%patch22 -p1}
 %patch23 -p1
-%patch24 -p1
+%{!?with_preemptive:%patch24 -p1}
 %patch25 -p1
 %patch26 -p1
 %patch28 -p1
@@ -909,11 +911,13 @@
 %endif
 %endif
 
+%if %{without preemptive}
 %if %{with grsecurity}
 %patch200 -p1
 %else
 %patch199 -p1
 %endif
+%endif
 
 %if %{with omosix}
 %{__patch} -p1 -F3 < %{PATCH201}
@@ -950,7 +954,9 @@
 sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
 
 %if %{with preemptive}
-sed -i 's:SPIN_LOCK_UNLOCKED:SPIN_LOCK_UNLOCKED(SendCmplPktQ.QueueLock):' drivers/net/sk98lin/sky2.c
+# probably won't be enough
+sed 's:SPIN_LOCK_UNLOCKED:RAW_SPIN_LOCK_UNLOCKED:' \
+	-i fs/reiser4/plugin/plugin_set.c
 for f in \
 	drivers/char/omnibook/ec.c \
 	net/ipv4/netfilter/ip_set.c \
@@ -965,6 +971,10 @@
 	net/ipv4/fib_semantics.c \
 	net/ipv6/netfilter/ip6t_expire.c \
 	net/ipv6/netfilter/ip6t_fuzzy.c \
+	fs/reiser4/block_alloc.c \
+	fs/reiser4/debug.c \
+	fs/reiser4/fsdata.c \
+	fs/reiser4/txnmgr.c \
 ; do
 	perl -pi -e 's/(.*\s+(.*)\s+=\s+\w+_LOCK_UNLOCKED)\s*;/$1\($2\);/' $f
 done
@@ -1094,6 +1104,7 @@
 	cat %{SOURCE94} >> arch/%{_target_base_arch}/defconfig
 %endif
 %if %{with preemptive}
+	sed '/CONFIG_PREEMPT/d' -i arch/%{_target_base_arch}/defconfig
 	cat %{SOURCE96} >> arch/%{_target_base_arch}/defconfig
 %endif
 %if %{with bootsplash}
@@ -1827,6 +1838,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1403  2006/02/19 21:16:14  sparky
+- realtime preemptive updated and partially fixed
+
 Revision 1.441.2.1402  2006/02/19 17:26:03  sparky
 - require at last mkvmlinuz ver 1.3
 
================================================================

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