SPECS: kernel-desktop.spec - use NO_HZ on i386 - disable e1000 on ...

[adamg]

Author: adamg                        Date: Tue Aug 21 21:56:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use NO_HZ on i386
- disable e1000 on ppc, causes ICE

---- Files affected:
SPECS:
   kernel-desktop.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.113 SPECS/kernel-desktop.spec:1.114
--- SPECS/kernel-desktop.spec:1.113	Tue Aug 21 17:11:27 2007
+++ SPECS/kernel-desktop.spec	Tue Aug 21 23:56:27 2007
@@ -705,6 +705,14 @@
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" .config}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" .config}
 
+# disable e1000 on ppc (ICEs)
+%ifarch ppc ppc64
+	sed -e "s:CONFIG_E1000=m:# CONFIG_E1000 is not set:" \
+		-e "s:CONFIG_E1000_NAPI=y:# CONFIG_E1000_NAPI is not set:" \
+		-e "s:CONFIG_E1000_DISABLE_PACKET_SPLIT=y:# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set:" \
+		-i .config
+%endif
+
 rm -f include/linux/autoconf.h
 %{__make} %{MakeOpts} include/linux/autoconf.h
 install .config arch/%{_target_base_arch}/defconfig
@@ -1030,6 +1038,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2007/08/21 21:56:27  adamg
+- use NO_HZ on i386
+- disable e1000 on ppc, causes ICE
+
 Revision 1.113  2007/08/21 15:11:27  adamg
 - patch85 info (from Wojciech Blaszkowski)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.113&r2=1.114&f=u