openSUSE Commits

Download

commit@lists.opensuse.org

June 2008

1 participants
771 discussions

commit apache2-mod_perl
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package apache2-mod_perl checked in at Mon Jun 30 15:29:47 CEST 2008. -------- --- apache2-mod_perl/apache2-mod_perl.changes 2008-01-15 01:17:44.000000000 +0100 +++ apache2-mod_perl/apache2-mod_perl.changes 2008-06-27 19:17:28.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jun 27 17:10:25 CEST 2008 - anicka(a)suse.cz + +- update to 2.0.4 + * Refactor tests to use keepalives instead of same_interp + * Apache2::Reload has been moved to an externally maintained + CPAN distribution + * Expose apr_thread_rwlock_t with the APR::ThreadRWLock module + * Catch up with some httpd API changes + * SECURITY: CVE-2007-1349 (cve.mitre.org) + fix unescaped variable interprolation in regular expression + fix ModPerl::RegistryCooker::read_script to handle all + possible errors, previously there was a case where + Apache2::Const::OK was returned on an error. + * bugfixes +- enable test suite + +------------------------------------------------------------------- Old: ---- mod_perl-2.0.3.99.tar.bz2 New: ---- mod_perl-2.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_perl.spec ++++++ --- /var/tmp/diff_new_pack.o22656/_old 2008-06-30 15:25:29.000000000 +0200 +++ /var/tmp/diff_new_pack.o22656/_new 2008-06-30 15:25:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package apache2-mod_perl (Version 2.0.3.99) +# spec file for package apache2-mod_perl (Version 2.0.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,6 +10,8 @@ # norootforbuild +Url: http://perl.apache.org/ + Name: apache2-mod_perl BuildRequires: apache2-devel db-devel ed pcre-devel perl-BSD-Resource perl-Compress-Zlib perl-Tie-IxHash perl-libwww-perl sudo %if 0%{sles_version} == 9 @@ -33,13 +35,13 @@ Obsoletes: mod_perl_2 Conflicts: mod_perl AutoReqProv: on -Version: 2.0.3.99 +Version: 2.0.4 Release: 1 Source0: mod_perl-%{version}.tar.bz2 #%define apache_test_version 1_99_15 # cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic up -r MODPERL_%{apache_test_version} #Source1: Apache-Test-%{apache_test_version}.tar.bz2 -Url: http://perl.apache.org/ +#Url: http://perl.apache.org/ Icon: mod_perl.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,6 +80,7 @@ %package devel +License: The Apache Software License Summary: Embedded Perl for Apache - Development package Group: Productivity/Networking/Web/Servers AutoReqProv: on @@ -141,10 +144,10 @@ #} t/TEST -start-httpd -port select -startup_timeout 720 t/TEST -run-tests || true -#t/TEST -run-tests || { -# t/TEST -stop-httpd -# exit 1 -#} +t/TEST -run-tests || { + t/TEST -stop-httpd + exit 1 +} t/TEST -stop-httpd # in case of failures, see http://perl.apache.org/docs/2.0/user/help/help.html#_C_make_test___Failures # then, debug like this: @@ -241,7 +244,7 @@ %{perl_vendorarch}/APR.pm %{perl_vendorarch}/Bundle %{perl_vendorarch}/ModPerl -%{perl_vendorarch}/MyTest +#%{perl_vendorarch}/MyTest #%dir %{perl_sitearch}/auto %{perl_vendorarch}/auto/* %{perl_vendorarch}/mod_perl2.pm @@ -260,12 +263,26 @@ fi %changelog -* Tue Jan 15 2008 - ro(a)suse.de +* Fri Jun 27 2008 anicka(a)suse.cz +- update to 2.0.4 + * Refactor tests to use keepalives instead of same_interp + * Apache2::Reload has been moved to an externally maintained + CPAN distribution + * Expose apr_thread_rwlock_t with the APR::ThreadRWLock module + * Catch up with some httpd API changes + * SECURITY: CVE-2007-1349 (cve.mitre.org) + fix unescaped variable interprolation in regular expression + fix ModPerl::RegistryCooker::read_script to handle all + possible errors, previously there was a case where + Apache2::Const::OK was returned on an error. + * bugfixes +- enable test suite +* Tue Jan 15 2008 ro(a)suse.de - update to SVN version to build with current perl - still ignore test-suite errors for the moment -* Thu Jun 14 2007 - anicka(a)suse.cz +* Thu Jun 14 2007 anicka(a)suse.cz - split up devel subpackage -* Tue Jan 23 2007 - anicka(a)suse.cz +* Tue Jan 23 2007 anicka(a)suse.cz - update to 2.0.3 * Prevent things in %%INC that are not stat() able from breaking Apache2::Status 'Loaded Modules' @@ -279,11 +296,11 @@ - remove last two patches (fixed in upstream) - temporarily disable t/api/server_const.t because it does not work with current get_server_version() -* Wed Aug 09 2006 - poeml(a)suse.de +* Wed Aug 09 2006 poeml(a)suse.de - build fix for sles9: add openldap2-devel to BuildRequires -* Fri Jul 14 2006 - olh(a)suse.de +* Fri Jul 14 2006 olh(a)suse.de - rename gzip archive from .bz2 to .gz -* Tue Jul 04 2006 - poeml(a)suse.de +* Tue Jul 04 2006 poeml(a)suse.de - add mod_perl-r411028-t_api_status.patch and mod_perl-t_content_length-r412063.patch, which both fix test cases to work with httpd trunk @@ -291,70 +308,70 @@ not been needed for long enough now - enable more apache modules in testing (deflate, proxy, proxy_http) -* Mon Jan 30 2006 - poeml(a)suse.de +* Mon Jan 30 2006 poeml(a)suse.de - removed libapr-util1-devel from BuildRequires (apache2-devel does require it) -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Dec 21 2005 - varkoly(a)suse.de +* Wed Dec 21 2005 varkoly(a)suse.de - Update to 2.0.2 -* Mon Dec 12 2005 - poeml(a)suse.de +* Mon Dec 12 2005 poeml(a)suse.de - fix quoting of dollar sign in here document which creates the startup file [#136882] -* Tue Nov 15 2005 - uli(a)suse.de +* Tue Nov 15 2005 uli(a)suse.de - disabled tests on ARM, don't make much sense with current QEMU -* Fri Aug 12 2005 - poeml(a)suse.de +* Fri Aug 12 2005 poeml(a)suse.de - install documentation [#95243] -* Tue Aug 02 2005 - pth(a)suse.de +* Tue Aug 02 2005 pth(a)suse.de - mod_perl2 needs a different startup file (#99275) -* Wed Jul 27 2005 - pth(a)suse.de +* Wed Jul 27 2005 pth(a)suse.de - Update to 2.0.1 -* Tue Jan 25 2005 - poeml(a)suse.de +* Tue Jan 25 2005 poeml(a)suse.de - update 2.0.0 to release candidate 4 - move usage hints from %%post into package description - remove obsolete stuff from %%clean -* Mon Dec 20 2004 - poeml(a)suse.de +* Mon Dec 20 2004 poeml(a)suse.de - update to 2.0.0, release candidate 1 - comment out mod_perl-1.99_09-ipv6.dif, it shouldn't be needed anymore for the build farm - the call to /usr/share/apache2/get_module_list is not needed - fix startup file for recent changes -* Mon Oct 11 2004 - poeml(a)suse.de +* Mon Oct 11 2004 poeml(a)suse.de - update to 1.99_15_20040907 - put Apache-Test in separate tarball -* Tue Mar 02 2004 - poeml(a)suse.de +* Wed Mar 03 2004 poeml(a)suse.de - update to CVS snapshot 1.99_12_20040302 - two tests need small tweaks for file permissions - mod_perl-1.99_09-perlmm.dif is obsolete - remove file ROADMAP from filelist -* Thu Feb 19 2004 - ro(a)suse.de +* Thu Feb 19 2004 ro(a)suse.de - added check-build.sh (build on 2.6 hosts only) -* Wed Jan 28 2004 - ro(a)suse.de +* Wed Jan 28 2004 ro(a)suse.de - build as normal user -* Tue Nov 18 2003 - poeml(a)suse.de +* Tue Nov 18 2003 poeml(a)suse.de - add some comments about the SOL_IPV6-test.c test program [#31246] -* Mon Sep 22 2003 - mls(a)suse.de +* Mon Sep 22 2003 mls(a)suse.de - fix build for official perl-5.8.1 (missing MM initialization) -* Thu Aug 28 2003 - poeml(a)suse.de +* Thu Aug 28 2003 poeml(a)suse.de - last added patch is not needed - clean up some old cruft from the spec file - use only IPv4 sockets for testing, if SOL_IPV6 socket option is not available. With this the package builds on all machines. -* Thu Aug 21 2003 - mjancar(a)suse.cz +* Thu Aug 21 2003 mjancar(a)suse.cz - honor user supplied OPTIMIZE like original MakeMaker does - use $RPM_OPT_FLAGS -* Wed Aug 20 2003 - mjancar(a)suse.cz +* Wed Aug 20 2003 mjancar(a)suse.cz - require the perl version we build with -* Thu Aug 07 2003 - poeml(a)suse.de +* Thu Aug 07 2003 poeml(a)suse.de - update to snapshot 1.99_09_20030803 - enable t/apr-ext/uuid.t (problem was that apr-config wasn't found) - add db-devel to neededforbuild, so APR.so can be linked with `apu-config --ldflags --libs` -* Wed Aug 06 2003 - poeml(a)suse.de +* Wed Aug 06 2003 poeml(a)suse.de - fix last change: config-dist.sh did never exit with "ok" -* Wed Aug 06 2003 - ro(a)suse.de +* Wed Aug 06 2003 ro(a)suse.de - use different string in config-dist.sh (one we check for ...) -* Mon Aug 04 2003 - poeml(a)suse.de +* Mon Aug 04 2003 poeml(a)suse.de - config-dist.sh: build only on hosts that support listening on IPv6-only sockets - increase the timeout when waiting for the test server. @@ -364,11 +381,11 @@ - don't make use of %%jobs, it doesn't work - obsolete mod_perl_2, the precursor - fix typo in %%post -* Mon Aug 04 2003 - poeml(a)suse.de +* Mon Aug 04 2003 poeml(a)suse.de - update to snapshot 1.99_09_20030803 - disable a new test that fails - add a diagnostic config-dist.sh -* Mon Jul 28 2003 - poeml(a)suse.de +* Mon Jul 28 2003 poeml(a)suse.de - update to snapshot 1.99_09_20030727 - add sudo to the buildsystem, so the tests can be run as nobody - don't explicitely strip binaries since RPM handles it, and may @@ -379,26 +396,26 @@ - allow passing of "jobs" define from rpm for make -j - install with install_vendor target, and use %%{perl_vendorarch} macro -* Tue Jul 01 2003 - ro(a)suse.de +* Tue Jul 01 2003 ro(a)suse.de - use perl_process_packlist macro -* Tue Jun 17 2003 - poeml(a)suse.de +* Tue Jun 17 2003 poeml(a)suse.de - add missing directories - add a hint on how to configure mod_perl -* Tue Jun 10 2003 - poeml(a)suse.de +* Tue Jun 10 2003 poeml(a)suse.de - update to 2.0_20030610110118 snapshot (called 1.99_09_20030610) -* Fri Feb 28 2003 - poeml(a)suse.de +* Fri Feb 28 2003 poeml(a)suse.de - make the test suite pass again, by renaming two .pl files of the test suite to .shtml, because mod_include didn't include files other than .shtml any longer -* Wed Feb 12 2003 - poeml(a)suse.de +* Wed Feb 12 2003 poeml(a)suse.de - rename package from mod_perl_2 to apache2-mod_perl -* Tue Feb 11 2003 - poeml(a)suse.de +* Tue Feb 11 2003 poeml(a)suse.de - call the new apache configuration script, so modules that are needed for the test get loaded -* Mon Feb 10 2003 - poeml(a)suse.de +* Mon Feb 10 2003 poeml(a)suse.de - MPM specific links to mod_dav_svn.so are no longer needed - add apache_libexecdir to filelist -* Tue Jan 14 2003 - poeml(a)suse.de +* Tue Jan 14 2003 poeml(a)suse.de - update to 1.99_08 - <Perl> directive missing closing '>' bug fixed, and much else - drop /etc/apache2/modules/mod_perl @@ -407,9 +424,9 @@ - add /etc/apache2/conf.d/mod_perl.conf, setting up scriptaliases /perl/, and /cgi-perl/ (for unaltered CGI scripts under mod_perl) - use %%defattr -* Wed Dec 04 2002 - poeml(a)suse.de +* Wed Dec 04 2002 poeml(a)suse.de - update to 1.99_07 - build one module, it works for all MPMs - use RPM_OPT_FLAGS -* Fri Aug 30 2002 - poeml(a)suse.de +* Fri Aug 30 2002 poeml(a)suse.de - new package with mod_perl-1.99_05 for Apache 2 ++++++ mod_perl-2.0.3.99.tar.bz2 -> mod_perl-2.0.4.tar.bz2 ++++++ ++++ 4143 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit digikam
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package digikam checked in at Mon Jun 30 15:25:21 CEST 2008. -------- --- KDE/digikam/digikam.changes 2008-05-17 00:04:00.000000000 +0200 +++ digikam/digikam.changes 2008-06-30 10:19:25.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 30 10:19:23 CEST 2008 - stbinner(a)suse.de + +- add missing %defattr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.P19366/_old 2008-06-30 15:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.P19366/_new 2008-06-30 15:24:14.000000000 +0200 @@ -31,7 +31,7 @@ Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager Version: 0.9.3 -Release: 62 +Release: 74 %define rversion 0.9.3 Url: http://www.digikam.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -197,13 +197,15 @@ %if %suse_version > 1020 %files lang -f %name.lang +%defattr(-,root,root) %files +%defattr(-,root,root) %else %files -f %name.lang -%endif %defattr(-,root,root) +%endif /opt/kde3/bin/* /opt/kde3/%_lib/*.so.* %exclude /opt/kde3/%_lib/kde3/digikamimageplugin*.la @@ -243,6 +245,8 @@ /opt/kde3/share/apps/digikamimageplugins/superimpose %changelog +* Mon Jun 30 2008 stbinner(a)suse.de +- add missing %%defattr * Sat May 17 2008 dmueller(a)suse.de - support custom whitebalance settings * Thu May 08 2008 dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-speech
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package gnome-speech checked in at Mon Jun 30 15:24:01 CEST 2008. -------- --- GNOME/gnome-speech/gnome-speech.changes 2008-05-16 20:24:44.000000000 +0200 +++ gnome-speech/gnome-speech.changes 2008-06-27 22:35:12.652572000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 27 22:42:27 CEST 2008 - mauro(a)suse.de + +- Update to 0.4.20 + + drivers/espeak/*: fix for bgo#35493 - eSpeak driver can + block. The fix adds a list mechanism to handle utterances + to be spoken and then processes them on the gidle thread. + Also raised the maximum speech rate for eSpeak. + + configure.in: be smarter about automatically finding espeak + + drivers/espeak/Makefile.am: remove libstdc++. It is not needed. + +------------------------------------------------------------------- Old: ---- gnome-speech-0.4.18.tar.bz2 New: ---- gnome-speech-0.4.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-speech.spec ++++++ --- /var/tmp/diff_new_pack.Y16620/_old 2008-06-30 15:22:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Y16620/_new 2008-06-30 15:22:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-speech (Version 0.4.18) +# spec file for package gnome-speech (Version 0.4.20) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ License: LGPL v2.1 or later Group: System/GUI/GNOME AutoReqProv: on -Version: 0.4.18 -Release: 45 +Version: 0.4.20 +Release: 1 Summary: GNOME Speech API Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-speech/0.4/gnome-speech-%{versi… Url: http://www.gnome.org @@ -103,6 +103,14 @@ %{_libdir}/pkgconfig/gnome-speech-1.0.pc %changelog +* Sat Jun 28 2008 mauro(a)suse.de +- Update to 0.4.20 + + drivers/espeak/*: fix for bgo#35493 - eSpeak driver can + block. The fix adds a list mechanism to handle utterances + to be spoken and then processes them on the gidle thread. + Also raised the maximum speech rate for eSpeak. + + configure.in: be smarter about automatically finding espeak + + drivers/espeak/Makefile.am: remove libstdc++. It is not needed. * Fri May 16 2008 aj(a)suse.de - Use /sbin/ldconfig directly in post scripts. - Remove extra BuildRequires. ++++++ gnome-speech-0.4.18.tar.bz2 -> gnome-speech-0.4.20.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/aclocal.m4 new/gnome-speech-0.4.20/aclocal.m4 --- old/gnome-speech-0.4.18/aclocal.m4 2008-01-14 14:15:41.000000000 +0100 +++ new/gnome-speech-0.4.20/aclocal.m4 2008-06-16 19:08:30.000000000 +0200 @@ -274,16 +274,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -327,9 +325,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -354,7 +352,7 @@ _PKG_TEXT -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/ChangeLog new/gnome-speech-0.4.20/ChangeLog --- old/gnome-speech-0.4.18/ChangeLog 2008-01-14 14:15:02.000000000 +0100 +++ new/gnome-speech-0.4.20/ChangeLog 2008-06-16 19:06:44.000000000 +0200 @@ -1,3 +1,24 @@ +2007-06-16 Willie Walker <william.walker(a)sun.com> + + * drivers/espeak/*: fix for bug 535493 - eSpeak driver can + block. The fix adds a list mechanism to handle utterances + to be spoken and then processes them on the gidle thread. + Also raised the maximum speech rate for eSpeak. + +2007-04-17 Willie Walker <william.walker(a)sun.com> + + * configure.in, NEWS, README: prep for 0.4.19. + +2007-03-25 Willie Walker <william.walker(a)sun.com> + + * configure.in: be smarter about automatically finding + espeak + +2007-03-19 Willie Walker <william.walker(a)sun.com> + + * drivers/espeak/Makefile.am: remove libstdc++. It is + not needed and makes the Solaris build fail. + 2007-01-14 Willie Walker <william.walker(a)sun.com> * configure.in, NEWS, README: prep for 0.4.18. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/configure new/gnome-speech-0.4.20/configure --- old/gnome-speech-0.4.18/configure 2008-01-14 14:15:47.000000000 +0100 +++ new/gnome-speech-0.4.20/configure 2008-06-16 19:08:40.000000000 +0200 @@ -2033,7 +2033,7 @@ GNOME_SPEECH_MAJOR_VERSION=0 GNOME_SPEECH_MINOR_VERSION=4 -GNOME_SPEECH_MICRO_VERSION=18 +GNOME_SPEECH_MICRO_VERSION=20 GNOME_SPEECH_INTERFACE_AGE=0 GNOME_SPEECH_BINARY_AGE=0 GNOME_SPEECH_VERSION="$GNOME_SPEECH_MAJOR_VERSION.$GNOME_SPEECH_MINOR_VERSION.$GNOME_SPEECH_MICRO_VERSION" @@ -19737,11 +19737,10 @@ { echo "$as_me:$LINENO: checking for ORBIT" >&5 echo $ECHO_N "checking for ORBIT... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$ORBIT_CFLAGS"; then - pkg_cv_ORBIT_CFLAGS="$ORBIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$ORBIT_CFLAGS"; then + pkg_cv_ORBIT_CFLAGS="$ORBIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= 2.3.94\"") >&5 ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= 2.3.94") 2>&5 ac_status=$? @@ -19751,15 +19750,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$ORBIT_LIBS"; then - pkg_cv_ORBIT_LIBS="$ORBIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$ORBIT_LIBS"; then + pkg_cv_ORBIT_LIBS="$ORBIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= 2.3.94\"") >&5 ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= 2.3.94") 2>&5 ac_status=$? @@ -19769,9 +19766,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -19784,9 +19780,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ORBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= 2.3.94"` + ORBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= 2.3.94" 2>&1` else - ORBIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= 2.3.94"` + ORBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= 2.3.94" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ORBIT_PKG_ERRORS" >&5 @@ -19823,7 +19819,7 @@ and ORBIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&5 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -19833,7 +19829,7 @@ and ORBIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else @@ -19851,11 +19847,10 @@ { echo "$as_me:$LINENO: checking for gnome_speech" >&5 echo $ECHO_N "checking for gnome_speech... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$gnome_speech_CFLAGS"; then - pkg_cv_gnome_speech_CFLAGS="$gnome_speech_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$gnome_speech_CFLAGS"; then + pkg_cv_gnome_speech_CFLAGS="$gnome_speech_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.94 gobject-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.94 gobject-2.0") 2>&5 ac_status=$? @@ -19865,15 +19860,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$gnome_speech_LIBS"; then - pkg_cv_gnome_speech_LIBS="$gnome_speech_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$gnome_speech_LIBS"; then + pkg_cv_gnome_speech_LIBS="$gnome_speech_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.94 gobject-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.94 gobject-2.0") 2>&5 ac_status=$? @@ -19883,9 +19876,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -19898,9 +19890,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - gnome_speech_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.94 gobject-2.0"` + gnome_speech_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.94 gobject-2.0" 2>&1` else - gnome_speech_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.94 gobject-2.0"` + gnome_speech_PKG_ERRORS=`$PKG_CONFIG --print-errors "bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.94 gobject-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$gnome_speech_PKG_ERRORS" >&5 @@ -19937,7 +19929,7 @@ and gnome_speech_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&5 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -19947,7 +19939,7 @@ and gnome_speech_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else @@ -20640,9 +20632,9 @@ espeak_LIBS="-L$with_espeak_dir/lib -lespeak" espeak_INCLUDES="$with_espeak_dir/include/espeak" else - { echo "$as_me:$LINENO: checking for __cxa_finalize in -lespeak" >&5 -echo $ECHO_N "checking for __cxa_finalize in -lespeak... $ECHO_C" >&6; } -if test "${ac_cv_lib_espeak___cxa_finalize+set}" = set; then + { echo "$as_me:$LINENO: checking for espeak_Synth in -lespeak" >&5 +echo $ECHO_N "checking for espeak_Synth in -lespeak... $ECHO_C" >&6; } +if test "${ac_cv_lib_espeak_espeak_Synth+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20660,11 +20652,11 @@ #ifdef __cplusplus extern "C" #endif -char __cxa_finalize (); +char espeak_Synth (); int main () { -return __cxa_finalize (); +return espeak_Synth (); ; return 0; } @@ -20687,21 +20679,21 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_espeak___cxa_finalize=yes + ac_cv_lib_espeak_espeak_Synth=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_espeak___cxa_finalize=no + ac_cv_lib_espeak_espeak_Synth=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_espeak___cxa_finalize" >&5 -echo "${ECHO_T}$ac_cv_lib_espeak___cxa_finalize" >&6; } -if test $ac_cv_lib_espeak___cxa_finalize = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_espeak_espeak_Synth" >&5 +echo "${ECHO_T}$ac_cv_lib_espeak_espeak_Synth" >&6; } +if test $ac_cv_lib_espeak_espeak_Synth = yes; then espeak_LIBS=-lespeak fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/configure.in new/gnome-speech-0.4.20/configure.in --- old/gnome-speech-0.4.18/configure.in 2008-01-14 14:15:02.000000000 +0100 +++ new/gnome-speech-0.4.20/configure.in 2008-06-16 19:07:42.000000000 +0200 @@ -2,7 +2,7 @@ GNOME_SPEECH_MAJOR_VERSION=0 GNOME_SPEECH_MINOR_VERSION=4 -GNOME_SPEECH_MICRO_VERSION=18 +GNOME_SPEECH_MICRO_VERSION=20 GNOME_SPEECH_INTERFACE_AGE=0 GNOME_SPEECH_BINARY_AGE=0 GNOME_SPEECH_VERSION="$GNOME_SPEECH_MAJOR_VERSION.$GNOME_SPEECH_MINOR_VERSION.$GNOME_SPEECH_MICRO_VERSION" @@ -260,7 +260,7 @@ espeak_LIBS="-L$with_espeak_dir/lib -lespeak" espeak_INCLUDES="$with_espeak_dir/include/espeak" else - AC_CHECK_LIB(espeak, __cxa_finalize, espeak_LIBS=-lespeak) + AC_CHECK_LIB(espeak, espeak_Synth, espeak_LIBS=-lespeak) espeak_INCLUDES="/usr/include/espeak" fi AC_SUBST(espeak_LIBS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/drivers/espeak/espeakspeaker.c new/gnome-speech-0.4.20/drivers/espeak/espeakspeaker.c --- old/gnome-speech-0.4.18/drivers/espeak/espeakspeaker.c 2008-01-14 14:15:01.000000000 +0100 +++ new/gnome-speech-0.4.20/drivers/espeak/espeakspeaker.c 2008-06-11 21:51:29.000000000 +0200 @@ -1,7 +1,7 @@ /* * GNOME Speech - Speech services for the GNOME desktop * - * Copyright 2007 Sun Microsystems Inc. + * Copyright 2007-2008 Sun Microsystems Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -267,12 +267,11 @@ s->driver = g_object_ref (d); /* Set the specified voice */ - espeak_VOICE a_voice; - memset( &a_voice, 0, sizeof(espeak_VOICE)); - a_voice.name = voice_spec->name; - a_voice.languages = NULL; - a_voice.gender = (voice_spec->gender == GNOME_Speech_gender_male); - espeak_SetVoiceByProperties(&a_voice); + memset( &speaker->voice, 0, sizeof(espeak_VOICE)); + speaker->voice.name = g_strdup(voice_spec->name); + speaker->voice.languages = NULL; + speaker->voice.gender = (voice_spec->gender == GNOME_Speech_gender_male); + espeak_SetVoiceByProperties(&speaker->voice); espeak_add_parameter (speaker, espeakPITCH, @@ -290,7 +289,7 @@ espeakRATE, "rate", 80, - 370, + 390, espeak_set_rate); espeak_add_parameter (speaker, espeakVOLUME, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/drivers/espeak/espeakspeaker.h new/gnome-speech-0.4.20/drivers/espeak/espeakspeaker.h --- old/gnome-speech-0.4.18/drivers/espeak/espeakspeaker.h 2008-01-14 14:15:01.000000000 +0100 +++ new/gnome-speech-0.4.20/drivers/espeak/espeakspeaker.h 2008-06-11 21:52:14.000000000 +0200 @@ -1,7 +1,7 @@ /* * GNOME Speech - Speech services for the GNOME desktop * - * Copyright 2007 Sun Microsystems Inc. + * Copyright 2007-2008 Sun Microsystems Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -49,6 +49,7 @@ typedef struct { Speaker parent; + espeak_VOICE voice; } EspeakSpeaker; typedef struct { @@ -60,7 +61,7 @@ EspeakSpeaker * espeak_speaker_new (GObject *d, - const GNOME_Speech_VoiceInfo *voice_speec); + const GNOME_Speech_VoiceInfo *voice_spec); #ifdef __cplusplus } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/drivers/espeak/espeaksynthesisdriver.c new/gnome-speech-0.4.20/drivers/espeak/espeaksynthesisdriver.c --- old/gnome-speech-0.4.18/drivers/espeak/espeaksynthesisdriver.c 2008-01-14 14:15:01.000000000 +0100 +++ new/gnome-speech-0.4.20/drivers/espeak/espeaksynthesisdriver.c 2008-06-11 21:49:44.000000000 +0200 @@ -1,7 +1,7 @@ /* * GNOME Speech - Speech services for the GNOME desktop * - * Copyright 2007 Sun Microsystems Inc. + * Copyright 2007-2008 Sun Microsystems Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,20 +27,28 @@ #include <string.h> #include <stdlib.h> #include <libbonobo.h> +#include <glib.h> #include <glib/gmain.h> #include <speak_lib.h> #include <gnome-speech/gnome-speech.h> #include "espeaksynthesisdriver.h" #include "espeakspeaker.h" - #define VERSION_LENGTH 20 +static gint utterance_id = 0; + typedef struct { GNOME_Speech_SpeechCallback cb; gboolean speech_is_started; -} t_index; + gint id; +} t_user_data; +typedef struct { + EspeakSpeaker *espeak_speaker; + char *text; + t_user_data *user_data; +} t_utterance; static GObjectClass *parent_class; @@ -51,13 +59,6 @@ } -static gboolean -espeak_synthesis_driver_timeout_callback (void *data) -{ - return TRUE; -} - - static int espeak_synthesis_driver_index_callback (short* wav, int numsamples, @@ -65,8 +66,9 @@ { if (event && event->user_data) { - t_index *user_data = event->user_data; - GNOME_Speech_speech_callback_type type=GNOME_Speech_speech_callback_speech_started; + t_user_data *user_data = event->user_data; + GNOME_Speech_speech_callback_type type = + GNOME_Speech_speech_callback_speech_started; gboolean a_callback_is_called = TRUE; @@ -102,7 +104,7 @@ CORBA_exception_init (&ev); GNOME_Speech_SpeechCallback_notify (user_data->cb, type, - event->unique_identifier, + user_data->id, event->text_position, &ev); @@ -174,11 +176,7 @@ espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 200, NULL); #endif - /* Add a timeout callback to poke this instance of eSpeak */ - - d->timeout_id = g_timeout_add_full (G_PRIORITY_HIGH_IDLE, 100, - espeak_synthesis_driver_timeout_callback, d, NULL); - + d->text_idle = 0; d->initialized = TRUE; } return d->initialized; @@ -383,8 +381,33 @@ { driver->mutex = g_mutex_new (); driver->last_speaker = NULL; - driver->index_queue = NULL; - driver->timeout_id = -1; + driver->utterance_queue = NULL; +} + + +static void +espeak_synthesis_driver_free_utterance (t_utterance *utterance) +{ + g_free (utterance->text); + g_free (utterance); +} + + +static void +espeak_synthesis_driver_flush_queue (EspeakSynthesisDriver *driver) +{ + GSList *tmp; + + /* Flush the utterance queue */ + + g_mutex_lock (driver->mutex); + for (tmp = driver->utterance_queue; tmp; tmp = tmp->next) { + t_utterance *u = (t_utterance *) tmp->data; + espeak_synthesis_driver_free_utterance (u); + } + g_slist_free (driver->utterance_queue); + driver->utterance_queue = NULL; + g_mutex_unlock (driver->mutex); } @@ -397,10 +420,10 @@ espeak_Synchronize (); espeak_Terminate (); - /* Remove timeout */ + if (d->text_idle) + g_source_remove (d->text_idle); - if (d->timeout_id >= 0) - g_source_remove (d->timeout_id); + espeak_synthesis_driver_flush_queue (d); if (parent_class->finalize) parent_class->finalize (obj); @@ -487,59 +510,104 @@ } + +static gboolean +espeak_idle(gpointer data) +{ + EspeakSynthesisDriver *driver = ESPEAK_SYNTHESIS_DRIVER (data); + gboolean rerun; + + g_mutex_lock (driver->mutex); + + if (driver->utterance_queue) { + t_utterance *utterance; + unsigned int unique_identifier=0; + espeak_ERROR a_error = EE_INTERNAL_ERROR; + + utterance = (t_utterance *) driver->utterance_queue->data; + espeak_SetVoiceByProperties(&utterance->espeak_speaker->voice); + a_error = espeak_Synth((char *) utterance->text, + strlen((char*)utterance->text) + 1, + 0, POS_CHARACTER, 0, espeakCHARS_UTF8, + &unique_identifier, + utterance->user_data); + + if (a_error != EE_BUFFER_FULL) { + driver->utterance_queue = g_slist_remove_link ( + driver->utterance_queue, + driver->utterance_queue); + espeak_synthesis_driver_free_utterance (utterance); + } + } + + if (driver->utterance_queue) { + rerun = TRUE; + } else { + driver->text_idle = 0; + rerun = FALSE; + } + + g_mutex_unlock (driver->mutex); + + return rerun; +} + + gint -espeak_synthesis_driver_say (EspeakSynthesisDriver *d, - EspeakSpeaker *s, +espeak_synthesis_driver_say (EspeakSynthesisDriver *driver, + EspeakSpeaker *espeak_speaker, gchar *text) { - Speaker *speaker = SPEAKER (s); - espeak_ERROR a_error = EE_INTERNAL_ERROR; - gint a_status = -1; - unsigned int unique_identifier=0; - - /* If this speaker wasn't the last one to speak, reset the speech parameters */ + t_utterance *utterance = NULL; + Speaker *speaker = SPEAKER (espeak_speaker); - if (d->last_speaker != s || speaker_needs_parameter_refresh(speaker)) { + speaker = SPEAKER (espeak_speaker); + if (driver->last_speaker != espeak_speaker + || speaker_needs_parameter_refresh(speaker)) { speaker_refresh_parameters (speaker); - d->last_speaker = s; + driver->last_speaker = espeak_speaker; } - - t_index *user_data = NULL; - if (speaker->cb != CORBA_OBJECT_NIL) - { - CORBA_Environment ev; + utterance = g_new (t_utterance, 1); + utterance->espeak_speaker = espeak_speaker; + utterance->text = g_strdup (text); - user_data = g_new(t_index, 1); + if (speaker->cb != CORBA_OBJECT_NIL) { + t_user_data *user_data; + CORBA_Environment ev; + user_data = g_new(t_user_data, 1); CORBA_exception_init (&ev); user_data->cb = CORBA_Object_duplicate (speaker->cb, &ev); - user_data->speech_is_started = FALSE; CORBA_exception_free (&ev); + user_data->speech_is_started = FALSE; + user_data->id = ++utterance_id; + utterance->user_data = user_data; + } else { + utterance->user_data = NULL; } - while(1) - { - a_error = espeak_Synth((char *) text, strlen((char*)text)+1, - 0, POS_CHARACTER, 0, espeakCHARS_UTF8, - &unique_identifier, user_data); - if (a_error != EE_BUFFER_FULL) - { - break; - } - usleep(20000); - }; - - - if (a_error == EE_OK) - a_status = (gint)unique_identifier; + g_mutex_lock (driver->mutex); + driver->utterance_queue = g_slist_append (driver->utterance_queue, + utterance); + if (!driver->text_idle) { + driver->text_idle = g_idle_add (espeak_idle, driver); + } + g_mutex_unlock (driver->mutex); - return a_status; + return utterance_id; } gboolean espeak_synthesis_driver_stop (EspeakSynthesisDriver *d) { + if (d->text_idle) { + g_source_remove (d->text_idle); + d->text_idle = 0; + } + + espeak_synthesis_driver_flush_queue (d); + espeak_Cancel (); return TRUE; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/drivers/espeak/espeaksynthesisdriver.h new/gnome-speech-0.4.20/drivers/espeak/espeaksynthesisdriver.h --- old/gnome-speech-0.4.18/drivers/espeak/espeaksynthesisdriver.h 2008-01-14 14:15:01.000000000 +0100 +++ new/gnome-speech-0.4.20/drivers/espeak/espeaksynthesisdriver.h 2008-06-11 21:52:01.000000000 +0200 @@ -1,7 +1,7 @@ /* * GNOME Speech - Speech services for the GNOME desktop * - * Copyright 2007 Sun Microsystems Inc. + * Copyright 2007-2008 Sun Microsystems Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -50,7 +50,8 @@ EspeakSpeaker *last_speaker; guint timeout_id; - GSList *index_queue; + guint text_idle; + GSList *utterance_queue; gboolean initialized; } EspeakSynthesisDriver; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/drivers/espeak/Makefile.am new/gnome-speech-0.4.20/drivers/espeak/Makefile.am --- old/gnome-speech-0.4.18/drivers/espeak/Makefile.am 2008-01-14 14:15:01.000000000 +0100 +++ new/gnome-speech-0.4.20/drivers/espeak/Makefile.am 2008-05-16 19:30:34.000000000 +0200 @@ -15,8 +15,7 @@ LDADD = $(top_builddir)/gnome-speech/libgnomespeech.la \ $(gnome_speech_LIBS) \ -L$(espeak_LIBDIR) \ - -lespeak \ - -lstdc++ + -lespeak espeak_synthesis_driver_SOURCES = \ espeaksynthesisdriver.c \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/drivers/espeak/Makefile.in new/gnome-speech-0.4.20/drivers/espeak/Makefile.in --- old/gnome-speech-0.4.18/drivers/espeak/Makefile.in 2008-01-14 14:15:49.000000000 +0100 +++ new/gnome-speech-0.4.20/drivers/espeak/Makefile.in 2008-06-16 19:08:36.000000000 +0200 @@ -252,8 +252,7 @@ LDADD = $(top_builddir)/gnome-speech/libgnomespeech.la \ $(gnome_speech_LIBS) \ -L$(espeak_LIBDIR) \ - -lespeak \ - -lstdc++ + -lespeak espeak_synthesis_driver_SOURCES = \ espeaksynthesisdriver.c \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/gnome-speech.spec new/gnome-speech-0.4.20/gnome-speech.spec --- old/gnome-speech-0.4.18/gnome-speech.spec 2008-01-14 14:16:14.000000000 +0100 +++ new/gnome-speech-0.4.20/gnome-speech.spec 2008-06-16 19:09:01.000000000 +0200 @@ -1,6 +1,6 @@ Summary: GNOME Desktop text-to-speech services Name: gnome-speech -Version: 0.4.18 +Version: 0.4.20 Release: 1 License: LGPL Group: Desktop/Accessibility diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/INSTALL new/gnome-speech-0.4.20/INSTALL --- old/gnome-speech-0.4.18/INSTALL 2008-01-14 14:16:14.000000000 +0100 +++ new/gnome-speech-0.4.20/INSTALL 2008-06-16 19:09:01.000000000 +0200 @@ -9,8 +9,8 @@ Simple install procedure ======================== - % gzip -cd gnome-speech-0.4.18.tar.gz | tar xvf - # unpack the sources - % cd gnome-speech-0.4.18 + % gzip -cd gnome-speech-0.4.20.tar.gz | tar xvf - # unpack the sources + % cd gnome-speech-0.4.20 % ./configure # run the `configure' script % make # build GTK [ Become root if necessary ] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/NEWS new/gnome-speech-0.4.20/NEWS --- old/gnome-speech-0.4.18/NEWS 2008-01-14 14:15:02.000000000 +0100 +++ new/gnome-speech-0.4.20/NEWS 2008-06-16 19:06:43.000000000 +0200 @@ -1,4 +1,18 @@ (top) +gnome-speech 0.4.20: + +* drivers/espeak/*: fix for bug 535493 - eSpeak driver can + block. The fix adds a list mechanism to handle utterances + to be spoken and then processes them on the gidle thread. + Also raised the maximum speech rate for eSpeak. + +gnome-speech 0.4.19: + +* configure.in: be smarter about automatically finding espeak + +* drivers/espeak/Makefile.am: remove libstdc++. It is not needed + and makes the Solaris build fail. + gnome-speech 0.4.18: * Fix for bug 508439 - Gnome speech Espeak driver will not compile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-speech-0.4.18/README new/gnome-speech-0.4.20/README --- old/gnome-speech-0.4.18/README 2008-01-14 14:15:02.000000000 +0100 +++ new/gnome-speech-0.4.20/README 2008-06-16 19:07:03.000000000 +0200 @@ -1,9 +1,9 @@ -GNOME Speech 0.4.18 +GNOME Speech 0.4.20 1. Introduction =============================================================================== -This is GNOME Speech version 0.4.18. It's purpose is to provide a +This is GNOME Speech version 0.4.20. It's purpose is to provide a simple general API for producing text-to-speech output. This version of gnome-speech *should* be fine for GNOME 2.12 and greater. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-session
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package gnome-session checked in at Mon Jun 30 15:22:45 CEST 2008. -------- --- GNOME/gnome-session/gnome-session.changes 2008-06-04 13:51:07.000000000 +0200 +++ gnome-session/gnome-session.changes 2008-06-27 21:45:31.559861000 +0200 @@ -1,0 +2,9 @@ +Fri Jun 27 21:36:06 CEST 2008 - mauro(a)suse.de + +- Update to version 2.23.4.1 +- Brand new code base, to know the new architecture, go to: + http://live.gnome.org/SessionManagement/NewGnomeSession +- Capplet ported to the new code base. +- Shutdown of D-bus, XSMP and Gconf when session is over. + +------------------------------------------------------------------- Old: ---- gnome-session-2.22.1.1.tar.bz2 New: ---- gnome-session-2.23.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.m14734/_old 2008-06-30 15:21:59.000000000 +0200 +++ /var/tmp/diff_new_pack.m14734/_new 2008-06-30 15:21:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-session (Version 2.22.1.1) +# spec file for package gnome-session (Version 2.23.4.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,11 +12,11 @@ Name: gnome-session -BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gnome-keyring-devel gnome-patch-translation gnome-settings-daemon-devel hicolor-icon-theme intltool libglade2-devel libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files +BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gnome-keyring-devel gnome-patch-translation gnome-settings-daemon-devel hicolor-icon-theme intltool libglade2-devel libgnomekbd libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME -Version: 2.22.1.1 -Release: 43 +Version: 2.23.4.1 +Release: 1 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome @@ -29,38 +29,38 @@ Source5: suse-help.svg #PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome suse.svg bnc388735 sbrabec(a)suse.cz Source6: suse.svg -#PATCH-FIX-UPSTREAM gnome-session-suspend.patch bnc73000 rodrigo(a)novell.com +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-UPSTREAM gnome-session-suspend.patch bnc73000 rodrigo(a)novell.com) Patch0: gnome-session-suspend.patch -#PATCH-FIX-OPENSUSE gnome-session-DESKTOP_LAUNCH.patch -- What was the original motivation for this? +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-OPENSUSE gnome-session-DESKTOP_LAUNCH.patch -- What was the original motivation for this?) Patch1: gnome-session-DESKTOP_LAUNCH.patch -#PATCH-FIX-UPSTREAM gnome-session-remove-dns-warning.patch federico(a)novell.com -- Apparently a patch from Meeks, needs review +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-UPSTREAM gnome-session-remove-dns-warning.patch federico(a)novell.com -- Apparently a patch from Meeks, needs review) Patch3: gnome-session-remove-dns-warning.patch -#PATCH-FIX-UPSTREAM gnome-session-2.12.0-su-session-management.patch hpj(a)novell.com +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-UPSTREAM gnome-session-2.12.0-su-session-management.patch hpj(a)novell.com) Patch5: gnome-session-2.12.0-su-session-management.patch -#PATCH-FIX-UPSTREAM gnome-session-2.19.92-kdm-support.patch hpj(a)novell.com +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-UPSTREAM gnome-session-2.19.92-kdm-support.patch hpj(a)novell.com) Patch7: gnome-session-2.19.92-kdm-support.patch -#PATCH-FEATURE-UPSTREAM gnome-session-motd.patch bgo159604 rodrigo(a)novell.com -- Needs to get upstream or be dropped +#PATCH-NEEDS-REBASE (was: #PATCH-FEATURE-UPSTREAM gnome-session-motd.patch bgo159604 rodrigo(a)novell.com -- Needs to get upstream or be dropped) Patch8: gnome-session-motd.patch -#PATCH-FIX-OPENSUSE gnome-session-wm-switch.patch bnc180506 danw(a)novell.com +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-OPENSUSE gnome-session-wm-switch.patch bnc180506 danw(a)novell.com) Patch12: gnome-session-wm-switch.patch -#PATCH-FIX-OPENSUSE gnome-session-no-devel-fatals.patch jpr(a)novell.com -- Prevents badly breaking factory for people +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-OPENSUSE gnome-session-no-devel-fatals.patch jpr(a)novell.com -- Prevents badly breaking factory for people) Patch13: gnome-session-no-devel-fatals.patch -#PATCH-FEATURE-OPENSUSE gnome-session-tile-ui.patch cgaisford(a)novell.com -- Feature from SLED 10 SP1 +#PATCH-NEEDS-REBASE (was: #PATCH-FEATURE-OPENSUSE gnome-session-tile-ui.patch cgaisford(a)novell.com -- Feature from SLED 10 SP1) Patch14: gnome-session-tile-ui.patch -#PATCH-FIX-UPSTREAM gnome-session-2.20.0-safe-a11y-startup.patch bnc302316 bgo469958 cgaisford(a)novell.com -- hpj(a)novell.com modified this for bnc332498 +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-UPSTREAM gnome-session-2.20.0-safe-a11y-startup.patch bnc302316 bgo469958 cgaisford(a)novell.com -- hpj(a)novell.com modified this for bnc332498) Patch15: gnome-session-2.20.0-safe-a11y-startup.patch -#PATCH-FIX-OPENSUSE gnome-session-sound.patch bnc294396 bgo466458 cgaisford(a)novell.com -- there is a newer version upstream from mandriva +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-OPENSUSE gnome-session-sound.patch bnc294396 bgo466458 cgaisford(a)novell.com -- there is a newer version upstream from mandriva ) Patch17: gnome-session-gcc4.3-fixes.patch Url: http://www.gnome.org -#PATCH-FIX-OPENSUSE gnome-session-parse-autostart-command-line.patch bnc180126 rodrigo(a)novell.com -- this is a temporary patch, remove when we update to the new gnome-session (2.23/2.24) +#PATCH-NEEDS-REBASE (was: #PATCH-FIX-OPENSUSE gnome-session-parse-autostart-command-line.patch bnc180126 rodrigo(a)novell.com -- this is a temporary patch, remove when we update to the new gnome-session (2.23/2.24) ) Patch18: gnome-session-parse-autostart-command-line.patch -# PATCH-FIX-UPSTREAM gnome-session-include-unistd.patch maw(a)novell.com -- Vincent says he'll accept this soon +#PATCH-NEEDS-REBASE (was: # PATCH-FIX-UPSTREAM gnome-session-include-unistd.patch maw(a)novell.com -- Vincent says he'll accept this soon) Patch19: gnome-session-include-unistd.patch -# PATCH-FIX-UPSTREAM gnome-session-bnc385150-performance-hostname.patch bnc385150 vuntz(a)novell.com -- Extreme slowness on some network setup +#PATCH-NEEDS-REBASE (was: # PATCH-FIX-UPSTREAM gnome-session-bnc385150-performance-hostname.patch bnc385150 vuntz(a)novell.com -- Extreme slowness on some network setup) Patch20: gnome-session-bnc385150-performance-hostname.patch -# PATCH-FEATURE-OPENSUSE gnome-session-gnome-wm-compiz-manager.patch vuntz(a)novell.com -- Launch compiz-manager when configured +#PATCH-NEEDS-REBASE (was: # PATCH-FEATURE-OPENSUSE gnome-session-gnome-wm-compiz-manager.patch vuntz(a)novell.com -- Launch compiz-manager when configured) Patch21: gnome-session-gnome-wm-compiz-manager.patch -# PATCH-FIX-OPENSUSE gnome-session-bnc389137-splash-layout.patch bnc389137 vuntz(a)novell.com -- Improve layout with our splash screen. +#PATCH-NEEDS-REBASE (was: # PATCH-FIX-OPENSUSE gnome-session-bnc389137-splash-layout.patch bnc389137 vuntz(a)novell.com -- Improve layout with our splash screen.) Patch22: gnome-session-bnc389137-splash-layout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: control-center2 @@ -116,24 +116,24 @@ %lang_package %prep %setup -q -gnome-patch-translation-prepare -%patch0 -%patch1 -p1 -%patch3 -%patch5 -p1 -%patch7 -%patch8 -%patch12 -p1 -%patch13 -%patch14 -p1 -%patch15 -p1 -%patch17 -p1 -%patch18 -%patch19 -p0 -%patch20 -p1 -%patch21 -p1 -%patch22 -gnome-patch-translation-update +#gnome-patch-translation-prepare +#%patch0 +#%patch1 -p1 +#%patch3 +#%patch5 -p1 +#%patch7 +#%patch8 +#%patch12 -p1 +#%patch13 +#%patch14 -p1 +#%patch15 -p1 +#%patch17 -p1 +#%patch18 +#%patch19 -p0 +#%patch20 -p1 +#%patch21 -p1 +#%patch22 +#gnome-patch-translation-update %build autoreconf -f -i @@ -177,11 +177,18 @@ %files -f %{name}.lst %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README +%dir %{_libdir}/gnome-session +%dir %{_libdir}/gnome-session/helpers +%dir %{_datadir}/gnome-session +%dir %{_datadir}/gnome/shutdown %{_bindir}/* %{_datadir}/applications/session-properties.desktop -%{_datadir}/gnome/default.session %{_datadir}/xsessions/*.desktop %{_datadir}/icons/hicolor/*/*/*.* +%{_datadir}/gnome/autostart/* +%{_datadir}/gnome-session/session-properties.glade +%{_libdir}/gnome-session/helpers/* +%{_datadir}/gnome/shutdown/* %dir %{_datadir}/pixmaps/splash %if %suse_version <= 1020 %dir %{_datadir}/xsessions @@ -196,6 +203,12 @@ %files lang -f %{name}-2.0.lang %changelog +* Fri Jun 27 2008 mauro(a)suse.de +- Update to version 2.23.4.1 +- Brand new code base, to know the new architecture, go to: + http://live.gnome.org/SessionManagement/NewGnomeSession +- Capplet ported to the new code base. +- Shutdown of D-bus, XSMP and Gconf when session is over. * Wed Jun 04 2008 rodrigo(a)suse.de - Added 'export ALSA_CONFIG_PATH=/etc/alsa-pulse.conf' to gnome startup script to make ALSA apps read our specific PulseAudio- ++++++ gnome-session-2.22.1.1.tar.bz2 -> gnome-session-2.23.4.1.tar.bz2 ++++++ ++++ 90918 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit filesystem
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package filesystem checked in at Mon Jun 30 15:19:35 CEST 2008. -------- --- filesystem/filesystem.changes 2008-04-01 23:19:07.000000000 +0200 +++ filesystem/filesystem.changes 2008-06-27 18:15:21.801422000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 27 18:22:34 CEST 2008 - maw(a)suse.de + +- Add Malay, Baba (bal). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filesystem.spec ++++++ --- /var/tmp/diff_new_pack.aY5980/_old 2008-06-30 15:16:58.000000000 +0200 +++ /var/tmp/diff_new_pack.aY5980/_new 2008-06-30 15:16:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package filesystem (Version 11.0) +# spec file for package filesystem (Version 11.0.42) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ Group: System/Fhs AutoReqProv: on Summary: Basic Directory Layout -Version: 11.0 -Release: 31 +Version: 11.0.42 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: aaa_dir Provides: aaa_dir @@ -165,6 +165,8 @@ %changelog +* Fri Jun 27 2008 maw(a)suse.de +- Add Malay, Baba (bal). * Wed Apr 02 2008 mrueckert(a)suse.de - removed uz@Cyrl and uz@Latn - added uz@cyrillic instead ++++++ languages ++++++ --- filesystem/languages 2008-04-01 23:18:06.000000000 +0200 +++ filesystem/languages 2008-06-27 18:14:28.342930000 +0200 @@ -6,6 +6,7 @@ as az az_IR +bal be be@latin bg ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-desktop
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package gnome-desktop checked in at Mon Jun 30 12:17:18 CEST 2008. -------- --- GNOME/gnome-desktop/gnome-desktop.changes 2008-06-20 18:59:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-desktop/gnome-desktop.changes 2008-06-30 12:13:54.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 30 12:13:46 CEST 2008 - aj(a)suse.de + +- Remove gnome-desktop from baselibs.conf. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop.spec ++++++ --- /var/tmp/diff_new_pack.m19621/_old 2008-06-30 12:17:03.000000000 +0200 +++ /var/tmp/diff_new_pack.m19621/_new 2008-06-30 12:17:03.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/GUI/GNOME Obsoletes: gnome-core Version: 2.23.4 -Release: 1 +Release: 2 Summary: The GNOME Desktop API Library Source: %{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -182,6 +182,8 @@ %{_datadir}/gtk-doc/html/gnome-desktop %changelog +* Mon Jun 30 2008 aj(a)suse.de +- Remove gnome-desktop from baselibs.conf. * Fri Jun 20 2008 maw(a)suse.de - Update to version 2.23.4: + Require intltool 0.40.0 ++++++ baselibs.conf ++++++ --- GNOME/gnome-desktop/baselibs.conf 2008-05-11 11:50:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-desktop/baselibs.conf 2008-06-30 12:13:44.000000000 +0200 @@ -1,4 +1,3 @@ -gnome-desktop libgnome-desktop-2-2 obsoletes "gnome-desktop-<targettype> <= <version>" provides "gnome-desktop-<targettype> = <version>" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package kernel-source checked in at Mon Jun 30 11:50:54 CEST 2008. -------- --- kernel-source/kernel-debug.changes 2008-06-23 07:34:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-06-28 10:03:07.000000000 +0200 @@ -1,0 +2,124 @@ +Fri Jun 27 22:06:12 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. + +------------------------------------------------------------------- +Fri Jun 27 21:50:27 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %package. + +------------------------------------------------------------------- +Fri Jun 27 21:16:38 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Allow Supplements to be optional. + +------------------------------------------------------------------- +Fri Jun 27 19:03:31 CEST 2008 - teheo(a)suse.de + +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). + +------------------------------------------------------------------- +Wed Jun 25 23:08:31 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires + +------------------------------------------------------------------- +Wed Jun 25 19:48:45 CEST 2008 - agruen(a)suse.de + +- Update reference module symbol versions. + +------------------------------------------------------------------- +Wed Jun 25 05:38:17 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config + +------------------------------------------------------------------- +Wed Jun 25 04:10:21 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m + +------------------------------------------------------------------- +Wed Jun 25 02:14:55 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG + +------------------------------------------------------------------- +Wed Jun 25 00:26:41 CEST 2008 - gregkh(a)suse.de + +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch + +------------------------------------------------------------------- +Tue Jun 24 07:53:27 CEST 2008 - teheo(a)suse.de + +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). + +------------------------------------------------------------------- +Tue Jun 24 06:01:17 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files + +Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + +Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). + +------------------------------------------------------------------- +Mon Jun 23 16:28:20 CEST 2008 - tiwai(a)suse.de + +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). + +------------------------------------------------------------------- +Mon Jun 23 16:06:39 CEST 2008 - jeffm(a)suse.de + +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. + +------------------------------------------------------------------- +Mon Jun 23 15:54:14 CEST 2008 - trenn(a)suse.de + +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. + +------------------------------------------------------------------- kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change New Changes file: --- /dev/null 2006-09-20 18:56:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-lockdep.changes 2008-06-28 10:03:07.000000000 +0200 @@ -0,0 +1,38753 @@ +------------------------------------------------------------------- +Fri Jun 27 22:06:12 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. + +------------------------------------------------------------------- +Fri Jun 27 21:50:27 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %package. + +------------------------------------------------------------------- +Fri Jun 27 21:16:38 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Allow Supplements to be optional. + +------------------------------------------------------------------- +Fri Jun 27 19:03:31 CEST 2008 - teheo(a)suse.de + +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). + +------------------------------------------------------------------- +Wed Jun 25 23:08:31 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires + +------------------------------------------------------------------- +Wed Jun 25 19:48:45 CEST 2008 - agruen(a)suse.de + +- Update reference module symbol versions. + +------------------------------------------------------------------- +Wed Jun 25 05:38:17 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config + +------------------------------------------------------------------- +Wed Jun 25 04:10:21 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m + +------------------------------------------------------------------- +Wed Jun 25 02:14:55 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG + +------------------------------------------------------------------- +Wed Jun 25 00:26:41 CEST 2008 - gregkh(a)suse.de + +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch + +------------------------------------------------------------------- +Tue Jun 24 07:53:27 CEST 2008 - teheo(a)suse.de + +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). + +------------------------------------------------------------------- +Tue Jun 24 06:01:17 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files + +Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + +Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). + +------------------------------------------------------------------- +Mon Jun 23 16:28:20 CEST 2008 - tiwai(a)suse.de + +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). + +------------------------------------------------------------------- +Mon Jun 23 16:06:39 CEST 2008 - jeffm(a)suse.de + +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. + +------------------------------------------------------------------- +Mon Jun 23 15:54:14 CEST 2008 - trenn(a)suse.de + +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. + +------------------------------------------------------------------- +Thu Jun 19 23:48:26 CEST 2008 - gregkh(a)suse.de + +- patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty + speed handling on 8250 (bnc#398370). + +------------------------------------------------------------------- +Thu Jun 19 14:30:04 CEST 2008 - jack(a)suse.cz + +- patches.fixes/jbd-fix-race-between-free-buffer-and-commit-trasanction.patch: + Fix occasional EIO return when direct io is mixed with buffered + IO (bnc#390384). + +------------------------------------------------------------------- +Thu Jun 19 12:02:13 CEST 2008 - jbeulich(a)novell.com + +- patches.xen/xen3-patch-2.6.21, + patches.xen/xen3-patch-2.6.24, + patches.xen/xen3-patch-2.6.25: Update (bnc#396129, bnc#397097, + bnc#394566). +- patches.xen/xen3-patch-2.6.25.5-6: Linux 2.6.25.6. +- patches.xen/xen3-seccomp-disable-tsc-option, + patches.xen/xen3-stack-unwind: Refresh. +- patches.xen/572-resume-alloc-no-swap.patch: Use GFP_NOIO to avoid + allocations which swap on resume. +- patches.xen/573-netfront-copy-recv-leak.patch: Fix memory leak for + copy-receiver of netfront. + +------------------------------------------------------------------- +Wed Jun 18 16:30:26 CEST 2008 - sdietrich(a)suse.de + +- patches.rt/rcu-preempt-hotplug-hackaround.patch: resolve conflict + +------------------------------------------------------------------- +Tue Jun 17 20:39:37 CEST 2008 - jeffm(a)suse.de + +- patches.fixes/reiserfs-discard-xattr-prealloc: reiserfs: + discard prealloc in reiserfs_delete_inode (bnc#389656). + +------------------------------------------------------------------- +Tue Jun 17 07:53:08 CEST 2008 - teheo(a)suse.de + +- patches.drivers/cdrom-dont-check-PLAY_AUDIO-in-count_tracks: + cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks() + (bnc#369558). + +------------------------------------------------------------------- +Tue Jun 17 06:07:38 CEST 2008 - teheo(a)suse.de + +- patches.drivers/libata-ahci-jmb361-one-port: ahci: jmb361 has + only one port (bnc#400729). +- patches.drivers/libata-ahci-sis-no-pmp: ahci: sis can't do PMP + (bnc#400728). +- patches.drivers/libata-implement-atapi-nopio: libata: implement + ATAPI_HORKAGE_NOPIO and apply it to GGW-H10N (bnc#400730). +- patches.drivers/libata-update-atapi_check_dma: libata: don't + check whether to use DMA or not for no data commands (bnc#400730). + +------------------------------------------------------------------- +Tue Jun 17 00:19:52 CEST 2008 - gregkh(a)suse.de + +- Update vanilla config files. + +------------------------------------------------------------------- +Mon Jun 16 23:44:39 CEST 2008 - gregkh(a)suse.de + +- Update config files to make build happy + +------------------------------------------------------------------- +Mon Jun 16 23:00:35 CEST 2008 - gregkh(a)suse.de + +- Update to 2.6.25.7 + - lots of bugfixes ++++ 38556 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-lockdep.changes --- kernel-source/kernel-pae.changes 2008-06-23 07:34:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-pae.changes 2008-06-28 10:03:07.000000000 +0200 @@ -1,0 +2,124 @@ +Fri Jun 27 22:06:12 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. + +------------------------------------------------------------------- +Fri Jun 27 21:50:27 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %package. + +------------------------------------------------------------------- +Fri Jun 27 21:16:38 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Allow Supplements to be optional. + +------------------------------------------------------------------- +Fri Jun 27 19:03:31 CEST 2008 - teheo(a)suse.de + +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). + +------------------------------------------------------------------- +Wed Jun 25 23:08:31 CEST 2008 - jeffm(a)suse.de + +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires + +------------------------------------------------------------------- +Wed Jun 25 19:48:45 CEST 2008 - agruen(a)suse.de + +- Update reference module symbol versions. + +------------------------------------------------------------------- +Wed Jun 25 05:38:17 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config + +------------------------------------------------------------------- +Wed Jun 25 04:10:21 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m + +------------------------------------------------------------------- +Wed Jun 25 02:14:55 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG + +------------------------------------------------------------------- +Wed Jun 25 00:26:41 CEST 2008 - gregkh(a)suse.de + +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch + +------------------------------------------------------------------- +Tue Jun 24 07:53:27 CEST 2008 - teheo(a)suse.de + +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). + +------------------------------------------------------------------- +Tue Jun 24 06:01:17 CEST 2008 - sdietrich(a)suse.de + +- RT: Update config files + +Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + +Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). + +------------------------------------------------------------------- +Mon Jun 23 16:28:20 CEST 2008 - tiwai(a)suse.de + +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). + +------------------------------------------------------------------- +Mon Jun 23 16:06:39 CEST 2008 - jeffm(a)suse.de + +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. + +------------------------------------------------------------------- +Mon Jun 23 15:54:14 CEST 2008 - trenn(a)suse.de + +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. + +------------------------------------------------------------------- kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-rt.changes: same change kernel-rt_debug.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change New: ---- kernel-lockdep.changes kernel-lockdep.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:00.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.25.7) +# spec file for package kernel-debug (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch %ix86 @@ -196,13 +196,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-debug-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-debug-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -279,7 +279,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-debug +KERNELRELEASE=2.6.25.9-$RELEASE-debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -445,18 +445,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-debug.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-debug.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/debug # so that kernel-source + kernel-debug is sufficient for building # modules that have modversions as well. @@ -599,6 +602,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:01.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.25.7) +# spec file for package kernel-default (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-default Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch %ix86 @@ -214,13 +214,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-default-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-default-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -297,7 +297,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-default +KERNELRELEASE=2.6.25.9-$RELEASE-default EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -463,18 +463,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-default.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-default.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/default # so that kernel-source + kernel-default is sufficient for building # modules that have modversions as well. @@ -617,6 +620,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:01.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.25.7) +# spec file for package kernel-dummy (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ Name: kernel-dummy Summary: Internal dummy package for synchronizing release numbers -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -29,7 +29,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %install @@ -41,6 +41,83 @@ %defattr(-, root, root) /etc/dummy %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:01.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.25.7) +# spec file for package kernel-kdump (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-kdump Summary: kernel for kdump -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch ppc @@ -195,13 +195,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-kdump-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-kdump-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -278,7 +278,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-kdump +KERNELRELEASE=2.6.25.9-$RELEASE-kdump EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -444,18 +444,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-kdump.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-kdump.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/kdump # so that kernel-source + kernel-kdump is sufficient for building # modules that have modversions as well. @@ -598,6 +601,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-lockdep.spec ++++++ ++++ 21839 lines (skipped) ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:01.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-pae (Version 2.6.25.7) +# spec file for package kernel-pae (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif Provides: k_smp4G kernel-bigsmp @@ -191,13 +191,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-pae-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-pae-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -274,7 +274,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-pae +KERNELRELEASE=2.6.25.9-$RELEASE-pae EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -440,18 +440,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-pae.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-pae.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/pae # so that kernel-source + kernel-pae is sufficient for building # modules that have modversions as well. @@ -594,6 +597,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.25.7) +# spec file for package kernel-ppc64 (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later; LGPL v2.1 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch ppc @@ -208,13 +208,13 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-ppc64-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -291,7 +291,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-ppc64 +KERNELRELEASE=2.6.25.9-$RELEASE-ppc64 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -457,18 +457,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ppc64.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ppc64.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/ppc64 # so that kernel-source + kernel-ppc64 is sufficient for building # modules that have modversions as well. @@ -611,6 +614,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ps3 (Version 2.6.25.7) +# spec file for package kernel-ps3 (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch ppc @@ -194,13 +194,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-ps3-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-ps3-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -277,7 +277,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-ps3 +KERNELRELEASE=2.6.25.9-$RELEASE-ps3 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -443,18 +443,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ps3.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ps3.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/ps3 # so that kernel-source + kernel-ps3 is sufficient for building # modules that have modversions as well. @@ -597,6 +600,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-rt_debug.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-rt_debug (Version 2.6.25.7) +# spec file for package kernel-rt_debug (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-rt_debug Summary: A Debug Version of the Kernel -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch %ix86 @@ -193,13 +193,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-rt_debug-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-rt_debug-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -276,7 +276,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-rt_debug +KERNELRELEASE=2.6.25.9-$RELEASE-rt_debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -442,18 +442,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-rt_debug.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-rt_debug.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/rt_debug # so that kernel-source + kernel-rt_debug is sufficient for building # modules that have modversions as well. @@ -596,6 +599,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-rt.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-rt (Version 2.6.25.7) +# spec file for package kernel-rt (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-rt Summary: The Realtime Linux Kernel -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch %ix86 @@ -198,13 +198,13 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-rt-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-rt-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -281,7 +281,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-rt +KERNELRELEASE=2.6.25.9-$RELEASE-rt EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -447,18 +447,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-rt.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-rt.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/rt # so that kernel-source + kernel-rt is sufficient for building # modules that have modversions as well. @@ -601,6 +604,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.25.7) +# spec file for package kernel-s390 (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif Provides: kernel-32bit k_deflt @@ -189,13 +189,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-s390-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-s390-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -272,7 +272,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-s390 +KERNELRELEASE=2.6.25.9-$RELEASE-s390 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -438,18 +438,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-s390.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-s390.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/s390 # so that kernel-source + kernel-s390 is sufficient for building # modules that have modversions as well. @@ -592,6 +595,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:03.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.25.7) +# spec file for package kernel-source (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -22,7 +22,7 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 only Group: Development/Sources @@ -33,7 +33,7 @@ BuildRequires: kernel-dummy %endif Provides: linux -Provides: kernel-source = 2.6.25.7-%source_rel +Provides: kernel-source = 2.6.25.9-%source_rel %if "kernel-source" == "kernel-source" Provides: linux lx_suse lx_sus22 lx_sus24 Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 @@ -68,14 +68,15 @@ Source51: kernel-debug.spec Source52: kernel-default.spec Source53: kernel-kdump.spec -Source54: kernel-pae.spec -Source55: kernel-ppc64.spec -Source56: kernel-ps3.spec -Source57: kernel-rt.spec -Source58: kernel-rt_debug.spec -Source59: kernel-s390.spec -Source60: kernel-vanilla.spec -Source61: kernel-xen.spec +Source54: kernel-lockdep.spec +Source55: kernel-pae.spec +Source56: kernel-ppc64.spec +Source57: kernel-ps3.spec +Source58: kernel-rt.spec +Source59: kernel-rt_debug.spec +Source60: kernel-s390.spec +Source61: kernel-vanilla.spec +Source62: kernel-xen.spec Source100: config.tar.bz2 Source101: patches.arch.tar.bz2 Source102: patches.drivers.tar.bz2 @@ -107,7 +108,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep @@ -130,9 +131,9 @@ chmod -Rf a+rX,g-w,o-w . # Apply the patches needed for this architecture. %_sourcedir/guards %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.25.7/kernel-source.patches -for patch in $(< %_builddir/kernel-source-2.6.25.7/kernel-source.patches); do - if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.25.7/$patch; then + > %_builddir/kernel-source-2.6.25.9/kernel-source.patches +for patch in $(< %_builddir/kernel-source-2.6.25.9/kernel-source.patches); do + if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.25.9/$patch; then echo "*** Patch $patch failed ***" exit 1 fi @@ -146,7 +147,7 @@ cat %_sourcedir/localversion > localversion fi %_sourcedir/install-configs %_sourcedir %_builddir/%buildsubdir $RELEASE -KERNELRELEASE=2.6.25.7-$RELEASE +KERNELRELEASE=2.6.25.9-$RELEASE cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF KERNELRELEASE=$KERNELRELEASE SYMBOLS="%symbols" @@ -168,8 +169,8 @@ esac set -- kernel-$flavor $flavor $(case $flavor in (rt|rt_*) echo RT ;; esac) %_sourcedir/guards $* %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.25.7/kernel-$flavor.patches - diff -q %_builddir/kernel-source-2.6.25.7/kernel-{source,$flavor}.patches \ + > %_builddir/kernel-source-2.6.25.9/kernel-$flavor.patches + diff -q %_builddir/kernel-source-2.6.25.9/kernel-{source,$flavor}.patches \ || continue o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor mkdir -p $o @@ -289,6 +290,83 @@ %files -f kernel-source.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:03.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.25.7) +# spec file for package kernel-syms (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: Development/Sources @@ -31,7 +31,7 @@ BuildRequires: kernel-dummy %endif %ifarch %ix86 -BuildRequires: kernel-debug kernel-default kernel-pae kernel-xen +BuildRequires: kernel-debug kernel-default kernel-lockdep kernel-pae kernel-xen %else %ifarch ppc BuildRequires: kernel-default kernel-kdump kernel-ppc64 kernel-ps3 @@ -49,7 +49,7 @@ BuildRequires: kernel-debug kernel-default %else %ifarch x86_64 -BuildRequires: kernel-debug kernel-default kernel-xen +BuildRequires: kernel-debug kernel-default kernel-lockdep kernel-xen %endif %endif %endif @@ -61,7 +61,7 @@ #!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd Requires: linux -Requires: kernel-source = 2.6.25.7-%source_rel +Requires: kernel-source = 2.6.25.9-%source_rel Source11: arch-symbols Source12: guards Source21: config.conf @@ -92,7 +92,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep @@ -145,6 +145,83 @@ /boot/symsets-*-*.tar.gz /lib/modules/*/build %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:03.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.25.7) +# spec file for package kernel-vanilla (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch %ix86 @@ -206,13 +206,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-vanilla-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-vanilla-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -289,7 +289,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-vanilla +KERNELRELEASE=2.6.25.9-$RELEASE-vanilla EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -455,18 +455,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-vanilla.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-vanilla.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/vanilla # so that kernel-source + kernel-vanilla is sufficient for building # modules that have modversions as well. @@ -609,6 +612,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.N31623/_old 2008-06-30 11:36:03.000000000 +0200 +++ /var/tmp/diff_new_pack.N31623/_new 2008-06-30 11:36:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.25.7) +# spec file for package kernel-xen (Version 2.6.25.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 2.6.25.7 +Version: 2.6.25.9 Release: 1 License: GPL v2 or later Group: System/Kernel @@ -83,8 +83,8 @@ %if %build_xen Requires: xen >= xen-3.0.4_13138 %ifarch %ix86 -Provides: kernel-xenpae = 2.6.25.7 -Obsoletes: kernel-xenpae <= 2.6.25.7 +Provides: kernel-xenpae = 2.6.25.9 +Obsoletes: kernel-xenpae <= 2.6.25.9 %endif #!BuildIgnore: xen %endif @@ -110,7 +110,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.25.7-%source_rel +Provides: kernel = 2.6.25.9-%source_rel %endif %endif %ifarch %ix86 @@ -195,13 +195,13 @@ -Source Timestamp: 2008-06-22 10:05:28 +0200 +Source Timestamp: 2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.25.tar.bz2 ]; then - echo "The kernel-xen-2.6.25.7.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.25.7.src.rpm." + echo "The kernel-xen-2.6.25.9.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.25.9.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -278,7 +278,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25.7-$RELEASE-xen +KERNELRELEASE=2.6.25.9-$RELEASE-xen EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -444,18 +444,21 @@ echo "Consistency check error: please update supported.conf." fi gzip -c9 < Module.symvers > %buildroot/boot/symvers-$KERNELRELEASE.gz -# Group the exported symbols listed in symvers.gz by directory, and -# create a database of sets. Preserve exports from previous kernels -# (stored in old-symsets.tar.gz) when possible. -old_symsets=%my_builddir/kabi/$SUBARCH/symsets-xen.tar.gz -[ -e $old_symsets ] || old_symsets= -( grep -v $'\tvmlinux$' Module.symvers +if grep -q '^CONFIG_MODULES=y$' .config; then + # Preserve exports from previous kernels when possible. + old_symsets=%my_builddir/kabi/$SUBARCH/symsets-xen.tar.gz + [ -e $old_symsets ] || old_symsets= + # Group the exported symbols listed in symvers.gz by directory, and + # create a database of sets. + ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended # up in vmlinux were defined. grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where -) | %_sourcedir/make-symsets \ + ) | %_sourcedir/make-symsets \ %buildroot/boot/symsets-$KERNELRELEASE.tar.gz \ - $old_symsets + $old_symsets || + [ -n "$ignore_kabi_changes" -o %tolerate_kabi_changes -ge 8 ] +fi # Also put the resulting file in $obj_dir/$SUBARCH/xen # so that kernel-source + kernel-xen is sufficient for building # modules that have modversions as well. @@ -598,6 +601,83 @@ %files -f kernel.files %changelog +* Sat Jun 28 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Removed Supplements handling + entirely. Use preamble instead. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Fixed case where Supplements could + be pulled out of any section other than %%package. +* Fri Jun 27 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Allow Supplements to be optional. +* Fri Jun 27 2008 teheo(a)suse.de +- patches.drivers/libata-ahci-clear-irq_stat: ahci: always clear + all bits in irq_stat (bnc#390937). +* Thu Jun 26 2008 jeffm(a)suse.de +- rpm/kernel-module-subpackage: Added Supplements tag copying and added + coreutils and grep to Requires +- rpm/macros.kernel-source: Added kernel-syms to BuildRequires +* Wed Jun 25 2008 agruen(a)suse.de +- Update reference module symbol versions. +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: + - CONFIG_HZ_250 --> CONFIG_HZ_1000 + - disable CONFIG_TIMER_STATS for rt config +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files: CONFIG_BLOCKER=y --> CONFIG_BLOCKER=m +* Wed Jun 25 2008 sdietrich(a)suse.de +- RT: Update config files - enable CPUSETs support: + CONFIG_CGROUPS, CONFIG_CGROUP_NS CONFIG_CPUSETS, + CONFIG_CGROUP_CPUACCT, CONFIG_RESOURCE_COUNTERS, + CONFIG_CGROUP_MEM_RES_CTLR, CONFIG_PROC_PID_CPUSET +- RT debug only: CONFIG_CGROUP_DEBUG +* Wed Jun 25 2008 gregkh(a)suse.de +- updated to 2.6.25.8 and then 2.6.25.9 + - fixes CVE-2008-2372 and CVE-2008-2826 + - lots of other bugfixes + - obsoletes: + - patches.arch/acpi_do_not_check_signature_for_load.patch + - patches.fixes/fix-tty-speed-handling-on-8250.patch +* Tue Jun 24 2008 teheo(a)suse.de +- patches.drivers/pci-vt3336-no-msi: pci: VT3336 can't do MSI + either (bnc#300001). +* Tue Jun 24 2008 sdietrich(a)suse.de +- RT: Update config files + Update to 2.6.25.8 (Suppress reverse-applying patches. RT-only) +- patches.kernel.org/patch-2.6.25.7-8: Linux 2.6.25.8. + Update to 2.6.25.8-rt7: (add new RT fixes) +- patches.rt/rwlock-pi-lock-reader.patch: Linux-RT 2.6.25.8-RT7. +- patches.rt/fix-adaptive-hack.patch: fix-adaptive-hack.patch. +- patches.rt/rwlock-slowunlock-mutex-fix.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rwlock-slowunlock-mutex-fix2.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/rt-mutex-use-inline.patch: rt-mutex-cleanup.patch. +- patches.rt/rt-mutex-namespace.patch: rt-mutex-namespace.patch. +- patches.rt/rtmutex-debug-fix.patch: rtmutex-debug-fix.patch. +- patches.rt/rwlock-protect-reader_lock_count.patch: Linux-RT + 2.6.25.8-RT7. +- patches.rt/ftrace-stop-trace-on-crash.patch: + fix-tracer-wreckage-wtf-is-this-code-all-features.patch. +- patches.rt/futex-fix-fault-damage.patch: + futex-fix-fault-damage.patch. +- patches.rt/rwlock-torture-no-rt.patch: rwlock: fix torture + test to handle non-rt. +- patches.rt/sched-global-rt-runtime.patch: Fwd: about + 2.6.25.4-rt5 (missing global_rt_runtime). +* Mon Jun 23 2008 tiwai(a)suse.de +- patches.drivers/alsa-fix-hda-alc262-sonyassamd-array: hda - + Fix "alc262_sony_unsol[]" hda_verb array (bnc#402612). +* Mon Jun 23 2008 jeffm(a)suse.de +- Added a -lockdep flavor on i386 and x86_64. It's the -default + config with lock debugging enabled. +* Mon Jun 23 2008 trenn(a)suse.de +- patches.arch/acpi_do_not_check_signature_for_load.patch: ACPICA: + Ignore ACPI table signature for Load() operator (bnc #396311). +- patches.arch/acpi_thermal_passive_blacklist.patch: Avoid + critical temp shutdowns on specific ThinkPad T4x(p) and R40 + (https://bugzilla.novell.com/show_bug.cgi?id=333043). +- patches.arch/acpi_introduce_osi_spec_conform.patch: Provide osi= + boot parameter to behave as BIOS developers expect it. * Fri Jun 20 2008 gregkh(a)suse.de - patches.fixes/fix-tty-speed-handling-on-8250.patch: Fix tty speed handling on 8250 (bnc#398370). ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2008-06-23 07:34:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2008-06-28 10:03:02.000000000 +0200 @@ -1,2 +1,2 @@ -2008-06-22 10:05:28 +0200 +2008-06-28 00:00:07 +0200 CVS Branch: SL110_BRANCH ++++++ config.conf ++++++ --- kernel-source/config.conf 2008-06-23 07:34:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/config.conf 2008-06-28 10:03:10.000000000 +0200 @@ -9,6 +9,7 @@ +IA32 i386/vanilla +IA32 i386/rt +IA32 i386/rt_debug ++IA32 i386/lockdep +ia64 ia64/default +ia64 ia64/debug @@ -18,6 +19,7 @@ #+x86_64 x86_64/um +x86_64 x86_64/xen +x86_64 x86_64/debug ++x86_64 x86_64/lockdep +x86_64 x86_64/vanilla +x86_64 x86_64/rt +x86_64 x86_64/rt_debug ++++++ config.tar.bz2 ++++++ ++++ 8254 lines of diff (skipped) ++++++ kabi-checks ++++++ --- kernel-source/kabi-checks 2008-06-23 07:34:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kabi-checks 2008-06-28 10:03:10.000000000 +0200 @@ -49,7 +49,7 @@ " # Turning off UTF-8 processing provides a major speedup. -export LANG=POSIX +export LC_ALL=C echo "${0##*/} $@" @@ -159,14 +159,20 @@ } filter_out_identical_symbols() { - grep -v -P '^\S+ -(\S+) \S+ \+\1 \S+$' + # This expression works no matter how many columns the files have. + grep -v -P '^\S+ -(\S+)( \S+)+ \+\1( \S+)+$' } check_modified_symbols() { declare -i RC=0 _rc declare ignored - while read symbol version1 source1 version2 source2; do + while read symbol tail; do + # Split in half no matter how many columns the files have. + set -- $tail ; half=$(($#/2+1)) + version1=$1 ; version2=${!half} ; shift + source1=$1 ; source2=${!half} ; shift + case "$version1$version2" in -\#*) continue ++++++ kabi.tar.bz2 ++++++ ++++ 75002 lines of diff (skipped) ++++++ kernel-module-subpackage ++++++ --- kernel-source/kernel-module-subpackage 2008-06-23 07:34:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-module-subpackage 2008-06-28 10:03:10.000000000 +0200 @@ -8,11 +8,11 @@ awk ' BEGIN { tags["summary"] = "Summary: %summary" tags["group"] = "Group: %group" } -/^%%/ { in_header = \ +/^%%/ { in_pkg_header = \ ($0 ~ /^%%package[ \t]+KMP[ \t]*$/ || $0 ~ /^%%package[ \t]+-n[ \t]*%name-KMP[ \t]*$/) next } -in_header && /^(Summary|Group):[ \t]*/ \ +in_pkg_header && /^(Summary|Group):[ \t]*/ \ { tag = tolower($1) ; sub(/:$/, "", tag) tags[tag] = $0 } END { print tags["summary"] @@ -20,7 +20,7 @@ ' $spec ) Provides: %{-n*} = %(echo %{-v*}-%3 | tr - _) -Requires: kernel-%1 +Requires: kernel-%1 coreutils grep AutoReqProv: on %{-p:%{expand:%(cd %_sourcedir; cat %{-p*})}} %description -n %{-n*}-%1 ++++++ macros.kernel-source ++++++ --- kernel-source/macros.kernel-source 2008-06-23 07:34:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/macros.kernel-source 2008-06-28 10:03:10.000000000 +0200 @@ -1,7 +1,7 @@ # Defines %flavors_to_build and %kernel_source() as a side effect. # ps3 has modules disabled, always skip it %_kernel_module_package(n:v:r:s:f:Xp:) \ -BuildRequires: module-init-tools \ +BuildRequires: module-init-tools kernel-syms\ %{expand:%( \ subpkg=%{-s*}%{!-s:/usr/lib/rpm/kernel-module-subpackage} \ echo "%%define _suse_kernel_module_subpackage(n:v:r:f:p:) %%{expand:%%(cd %_sourcedir; cat $subpkg; echo %%%%nil)}" \ ++++++ make-symsets ++++++ --- kernel-source/make-symsets 2008-06-23 07:34:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/make-symsets 2008-06-28 10:03:10.000000000 +0200 @@ -16,15 +16,19 @@ # Classify all the symbols by the directory they live in unset ${!class_*} -while read class line; do +while read class ignore line; do class=class_${class//[^a-zA-Z0-9_]/_} eval "$class[\${#$class[@]}]=\"$line\"" + if [ $ignore -gt 0 ]; then + eval "ignore_$class=1" + fi done < <( awk ' BEGIN { FS="\t" ; OFS="\t" } { class=$3 sub(/\/[^/]+$/, "", class) - print class, $0 + ignore=sub(/.*=>/, "", $1) + print class, ignore, $0 } ' ) @@ -71,17 +75,29 @@ [ $# -eq 1 ] || continue newset=$1 # '*' doesn't occur in either file. - if [ -z "$(join -t '*' -j 1 -v 1 "$oldset" "$newset")" ]; then + missing="$(join -t '*' -j 1 -v 1 <(sort "$oldset") <(sort "$newset"))" + if [ -z "$missing" ]; then keep_oldset[${#keep_oldset[@]}]=$oldset #echo "Provides: kernel($class) = ${oldset##*.} (old)" else - echo "No longer provided: kernel($class) = ${oldset##*.}" >&2 + set -- $(echo "$missing" | awk '{ print $2 "(" $1 ")" }') + ignore=ignore_class_$class + if [ -n "${!ignore}" ]; then + ignore="; ignoring" + else + ignore= + status=1 + fi + echo "No longer provided: kernel($class) = ${oldset##*.} (missing/changed: $@$ignore)" >&2 fi done if [ ${#keep_oldset[@]} -gt 0 ]; then mv "${keep_oldset[@]}" $newdir/ fi +else + echo "No longer provided: previous kernel(...) symbols that may still be" \ + "compatible" >&2 fi # Store the generated sets in $tarball @@ -90,4 +106,6 @@ > $tarball \ || exit 1 +exit $status + # vim:shiftwidth=4 softtabstop=4 ++++++ needed_space_in_mb ++++++ --- kernel-source/needed_space_in_mb 2008-06-23 22:33:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2008-06-28 10:03:25.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.addon.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/acpi_introduce_osi_spec_conform.patch new/patches.arch/acpi_introduce_osi_spec_conform.patch --- old/patches.arch/acpi_introduce_osi_spec_conform.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/acpi_introduce_osi_spec_conform.patch 2008-06-23 16:04:08.000000000 +0200 @@ -0,0 +1,80 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: Provide osi= boot parameter to behave as BIOS developers expect it +Patch-mainline: not yet + +Linux ACPI subsystem lies to the BIOS and pretends to be Windows. +The intend is to try to get the Linux ACPI implementation as close to the +Windows one as possible. + +But the osi functionality is mis-used by BIOS developers and vendors +to workaround certain specific Microsoft Windows Version XY bugs. + +The ACPI implementation is intended to run well without any osi hooks. +It normally gets tested intensively by vendors without them. Osi hooks +workaround specific bugs in the OS which Linux in general cannot and must +not adopt. + +Also the current Linux osi implementation (return false for Linux and true +for Windows XY) makes it impossible for vendors to support both Windows and +Linux on the same machine providing the same BIOS. + +A simple real world example: +Windows implements (or extends) XP SP2 with _PPC functionality/fixes +(BIOS informs OS to change frequency limits at runtime). +This breaks a lot laptops. Typically (they have no other choice) they +fix this with a BIOS update embedding the ASL code into +osi="Windows 2001.1 SP2" condition and workaround the XP SP2 bug there. +But this BIOS update will break the Linux OS they also claim to support. + +Again: The current Linux osi ACPI implementation makes it impossible for +vendors and distributionsto provide proper support, e.g. for pre-loads. + +A workaround is to patch the kernel with an OS string which the vendor claims +to support, e.g. "osi=SLES10 SP2", but this make things even worse. Long term +solution must provide vendors a way to differ Windows vs Linux OS. + +The current situation is a maintenance nightmare. The same machines are +breaking over and over again, by simply updating the BIOS. +Distributions and vendors do want and need the current osi implementation +to change to the one provided with this patch and boot param osi=spec_conform! + +--- + drivers/acpi/osl.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +Index: linux-acpi-2.6_video_native_vs_vendor/drivers/acpi/osl.c +=================================================================== +--- linux-acpi-2.6_video_native_vs_vendor.orig/drivers/acpi/osl.c ++++ linux-acpi-2.6_video_native_vs_vendor/drivers/acpi/osl.c +@@ -943,7 +943,7 @@ static void __init set_osi_linux(unsigne + if (osi_linux.enable != enable) { + osi_linux.enable = enable; + printk(KERN_NOTICE PREFIX "%sed _OSI(Linux)\n", +- enable ? "Add": "Delet"); ++ enable ? "Add": "Delete"); + } + return; + } +@@ -984,12 +984,22 @@ int __init acpi_osi_setup(char *str) + if (str == NULL || *str == '\0') { + printk(KERN_INFO PREFIX "_OSI method disabled\n"); + acpi_gbl_create_osi_method = FALSE; ++ } else if (strcmp("spec_conform", str)) { ++ set_osi_linux(1); ++ acpi_osi_invalidate("Windows 2000"); ++ acpi_osi_invalidate("Windows 2001"); ++ acpi_osi_invalidate("Windows 2001 SP1"); ++ acpi_osi_invalidate("Windows 2001 SP2"); ++ acpi_osi_invalidate("Windows 2001.1"); ++ acpi_osi_invalidate("Windows 2001.1 SP1"); ++ acpi_osi_invalidate("Windows 2006"); + } else if (!strcmp("!Linux", str)) { + acpi_cmdline_osi_linux(0); /* !enable */ + } else if (*str == '!') { + if (acpi_osi_invalidate(++str) == AE_OK) + printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str); + } else if (!strcmp("Linux", str)) { ++osi_linux.cmdline = 1; + acpi_cmdline_osi_linux(1); /* enable */ + } else if (*osi_additional_string == '\0') { + strncpy(osi_additional_string, str, OSI_STRING_LENGTH_MAX); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/acpi_thermal_passive_blacklist.patch new/patches.arch/acpi_thermal_passive_blacklist.patch --- old/patches.arch/acpi_thermal_passive_blacklist.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/acpi_thermal_passive_blacklist.patch 2008-06-23 16:04:08.000000000 +0200 @@ -0,0 +1,106 @@ +From: Thomas Renninger <trenn(a)suse.de> +Subject: Avoid critical temp shutdowns on specific ThinkPad T4x(p) and R40 +References: https://bugzilla.novell.com/show_bug.cgi?id=333043 + +--- + drivers/acpi/thermal.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 73 insertions(+) + +Index: linux-2.6.25-SL110_BRANCH/drivers/acpi/thermal.c +=================================================================== +--- linux-2.6.25-SL110_BRANCH.orig/drivers/acpi/thermal.c ++++ linux-2.6.25-SL110_BRANCH/drivers/acpi/thermal.c +@@ -42,6 +42,7 @@ + #include <linux/kmod.h> + #include <linux/seq_file.h> + #include <linux/reboot.h> ++#include <linux/dmi.h> + #include <asm/uaccess.h> + #include <linux/thermal.h> + #include <acpi/acpi_bus.h> +@@ -1576,6 +1577,66 @@ static int acpi_thermal_get_info(struct + return 0; + } + ++static struct dmi_system_id thermal_psv_dmi_table[] = { ++ { ++ .ident = "IBM ThinkPad T41", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T41"), ++ }, ++ }, ++ { ++ .ident = "IBM ThinkPad T42", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T42"), ++ }, ++ }, ++ { ++ .ident = "IBM ThinkPad T43", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T43"), ++ }, ++ }, ++ { ++ .ident = "IBM ThinkPad T41p", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T41p"), ++ }, ++ }, ++ { ++ .ident = "IBM ThinkPad T42p", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T42p"), ++ }, ++ }, ++ { ++ .ident = "IBM ThinkPad T43p", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T43p"), ++ }, ++ }, ++ { ++ .ident = "IBM ThinkPad R40", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad R40"), ++ }, ++ }, ++ { ++ .ident = "IBM ThinkPad R50p", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad R50p"), ++ }, ++ }, ++ {}, ++}; ++ + static int acpi_thermal_add(struct acpi_device *device) + { + int result = 0; +@@ -1606,6 +1667,18 @@ static int acpi_thermal_add(struct acpi_ + if (result) + goto free_memory; + ++ if (dmi_check_system(thermal_psv_dmi_table)) { ++ if (tz->trips.passive.flags.valid && ++ tz->trips.passive.temperature > CELSIUS_TO_KELVIN(85)) { ++ printk (KERN_INFO "Adjust passive trip point from %lu" ++ " to %lu\n", ++ KELVIN_TO_CELSIUS(tz->trips.passive.temperature), ++ KELVIN_TO_CELSIUS(tz->trips.passive.temperature - 150)); ++ tz->trips.passive.temperature -= 150; ++ acpi_thermal_set_polling(tz, 5); ++ } ++ } ++ + result = acpi_thermal_add_fs(device); + if (result) + goto unregister_thermal_zone; ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/alsa-fix-hda-alc262-sonyassamd-array new/patches.drivers/alsa-fix-hda-alc262-sonyassamd-array --- old/patches.drivers/alsa-fix-hda-alc262-sonyassamd-array 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/alsa-fix-hda-alc262-sonyassamd-array 2008-06-23 16:39:08.000000000 +0200 @@ -0,0 +1,27 @@ +From: Akio Idehara <zbe64533(a)gmail.com> +Date: Mon, 9 Jun 2008 22:46:07 +0900 +Subject: [ALSA] hda - Fix "alc262_sony_unsol[]" hda_verb array +Patch-mainline: 2.6.26-rc6 +References: 402612 + +I think that hda_verb array must have "terminator (empty array)". +But alc262_sony_unsol[] does not have it. +And it causes gcc-4.3's buggy behavior +with snd_hda_sequence_write(). + +Signed-off-by: Akio Idehara <zbe64533(a)gmail.com> +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 247fba5..7997e13 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -8839,6 +8839,7 @@ static struct hda_verb alc262_sony_unsol_verbs[] = { + + {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, + {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, ++ {} + }; + + /* mute/unmute internal speaker according to the hp jack and mute state */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-ahci-clear-irq_stat new/patches.drivers/libata-ahci-clear-irq_stat --- old/patches.drivers/libata-ahci-clear-irq_stat 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/libata-ahci-clear-irq_stat 2008-06-27 19:14:05.000000000 +0200 @@ -0,0 +1,52 @@ +From: Tejun Heo <tj(a)kernel.org> +Subject: ahci: always clear all bits in irq_stat +References: bnc#390937 + +Some AHCI controllers (ICH7 was reported) set pending bit in +HOST_IRQ_STAT for non-existent ports and when it's not cleared falls +into IRQ storm. Always clear full irq_stat instead of only the bits +that are handled. As nothing changes for recognized ports, the risk +of breaking things is pretty low. + +Reported and verified by Philipp Thomas in the following suse +bugzilla. + +https://bugzilla.novell.com/attachment.cgi?id=215692 + +Signed-off-by: Tejun Heo <tj(a)kernel.org> +Cc: Philipp Thomas <pth(a)novell.com> +Signed-off-by: Tejun Heo <teheo(a)suse.de> +--- + drivers/ata/ahci.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +Index: linux-2.6.25-SL110_BRANCH/drivers/ata/ahci.c +=================================================================== +--- linux-2.6.25-SL110_BRANCH.orig/drivers/ata/ahci.c ++++ linux-2.6.25-SL110_BRANCH/drivers/ata/ahci.c +@@ -1820,7 +1820,7 @@ static irqreturn_t ahci_interrupt(int ir + struct ahci_host_priv *hpriv; + unsigned int i, handled = 0; + void __iomem *mmio; +- u32 irq_stat, irq_ack = 0; ++ u32 irq_stat; + + VPRINTK("ENTER\n"); + +@@ -1852,14 +1852,11 @@ static irqreturn_t ahci_interrupt(int ir + "interrupt on disabled port %u\n", i); + } + +- irq_ack |= (1 << i); +- } +- +- if (irq_ack) { +- writel(irq_ack, mmio + HOST_IRQ_STAT); + handled = 1; + } + ++ writel(irq_stat, mmio + HOST_IRQ_STAT); ++ + spin_unlock(&host->lock); + + VPRINTK("EXIT\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/pci-vt3336-no-msi new/patches.drivers/pci-vt3336-no-msi --- old/patches.drivers/pci-vt3336-no-msi 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/pci-vt3336-no-msi 2008-06-24 08:03:41.000000000 +0200 @@ -0,0 +1,27 @@ +From: Tejun Heo <tj(a)kernel.org> +Subject: pci: VT3336 can't do MSI either +References: bnc#300001 + +It seems VT3336 can't do msi either as with its bro 3351. Disable it. +Reported in the following SUSE bug. + + https://bugzilla.novell.com/show_bug.cgi?id=300001 + +Signed-off-by: Tejun Heo <tj(a)kernel.org> +Signed-off-by: Tejun Heo <teheo(a)suse.de> +--- + drivers/pci/quirks.c | 1 + + 1 file changed, 1 insertion(+) + +Index: linux-2.6.25-SL110_BRANCH/drivers/pci/quirks.c +=================================================================== +--- linux-2.6.25-SL110_BRANCH.orig/drivers/pci/quirks.c ++++ linux-2.6.25-SL110_BRANCH/drivers/pci/quirks.c +@@ -1711,6 +1711,7 @@ static void __init quirk_disable_all_msi + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_disable_all_msi); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3336, quirk_disable_all_msi); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi); + + /* Disable MSI on chipsets that are known to not support it */ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/fix-tty-speed-handling-on-8250.patch new/patches.fixes/fix-tty-speed-handling-on-8250.patch --- old/patches.fixes/fix-tty-speed-handling-on-8250.patch 2008-06-19 23:52:11.000000000 +0200 +++ new/patches.fixes/fix-tty-speed-handling-on-8250.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -From e991a2bd4fa0b2f475b67dfe8f33e8ecbdcbb40b Mon Sep 17 00:00:00 2001 -From: Alan Cox <alan(a)lxorguk.ukuu.org.uk> -Date: Mon, 28 Apr 2008 02:14:06 -0700 -Subject: Fix tty speed handling on 8250 -Patch-mainline: 2.6.26 -References: bnc398370 - -From: Alan Cox <alan(a)lxorguk.ukuu.org.uk> - -commit e991a2bd4fa0b2f475b67dfe8f33e8ecbdcbb40b upstream. - -We try and write the correct speed back but the serial midlayer already -mangles the speed on us and that means if we request B0 we report back B9600 -when we should not. For now we'll hack around this in the drivers and serial -code, pending a better long term solution. - -Signed-off-by: Alan Cox <alan(a)redhat.com> -Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> -Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - drivers/serial/8250.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/serial/8250.c -+++ b/drivers/serial/8250.c -@@ -2174,7 +2174,9 @@ serial8250_set_termios(struct uart_port - } - serial8250_set_mctrl(&up->port, up->port.mctrl); - spin_unlock_irqrestore(&up->port.lock, flags); -- tty_termios_encode_baud_rate(termios, baud, baud); -+ /* Don't rewrite B0 */ -+ if (tty_termios_baud_rate(termios)) -+ tty_termios_encode_baud_rate(termios, baud, baud); - } - - static void ++++++ patches.kernel.org.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.kernel.org/patch-2.6.25.7-8 new/patches.kernel.org/patch-2.6.25.7-8 --- old/patches.kernel.org/patch-2.6.25.7-8 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kernel.org/patch-2.6.25.7-8 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,513 @@ +From: Greg Kroah-Hartman <gregkh(a)suse.de> +Subject: Linux 2.6.25.8 + +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> + +diff --git a/Makefile b/Makefile +index ab94c3f..e18e2b8 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 25 +-EXTRAVERSION = .7 ++EXTRAVERSION = .8 + NAME = Funky Weasel is Jiggy wit it + + # *DOCUMENTATION* +diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c +index c8890b8..39b1b7e 100644 +--- a/arch/x86/kernel/process_32.c ++++ b/arch/x86/kernel/process_32.c +@@ -259,12 +259,31 @@ static void mwait_idle(void) + mwait_idle_with_hints(0, 0); + } + ++/* ++ * mwait selection logic: ++ * ++ * It depends on the CPU. For AMD CPUs that support MWAIT this is ++ * wrong. Family 0x10 and 0x11 CPUs will enter C1 on HLT. Powersavings ++ * then depend on a clock divisor and current Pstate of the core. If ++ * all cores of a processor are in halt state (C1) the processor can ++ * enter the C1E (C1 enhanced) state. If mwait is used this will never ++ * happen. ++ * ++ * idle=mwait overrides this decision and forces the usage of mwait. ++ */ + static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) + { + if (force_mwait) + return 1; +- /* Any C1 states supported? */ +- return c->cpuid_level >= 5 && ((cpuid_edx(5) >> 4) & 0xf) > 0; ++ ++ if (c->x86_vendor == X86_VENDOR_AMD) { ++ switch(c->x86) { ++ case 0x10: ++ case 0x11: ++ return 0; ++ } ++ } ++ return 1; + } + + void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) +diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c +index 1316f1c..53b9c4c 100644 +--- a/arch/x86/kernel/process_64.c ++++ b/arch/x86/kernel/process_64.c +@@ -254,13 +254,31 @@ static void mwait_idle(void) + } + } + +- ++/* ++ * mwait selection logic: ++ * ++ * It depends on the CPU. For AMD CPUs that support MWAIT this is ++ * wrong. Family 0x10 and 0x11 CPUs will enter C1 on HLT. Powersavings ++ * then depend on a clock divisor and current Pstate of the core. If ++ * all cores of a processor are in halt state (C1) the processor can ++ * enter the C1E (C1 enhanced) state. If mwait is used this will never ++ * happen. ++ * ++ * idle=mwait overrides this decision and forces the usage of mwait. ++ */ + static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) + { + if (force_mwait) + return 1; +- /* Any C1 states supported? */ +- return c->cpuid_level >= 5 && ((cpuid_edx(5) >> 4) & 0xf) > 0; ++ ++ if (c->x86_vendor == X86_VENDOR_AMD) { ++ switch(c->x86) { ++ case 0x10: ++ case 0x11: ++ return 0; ++ } ++ } ++ return 1; + } + + void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) +diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S +index 70bebd3..ee1c3f6 100644 +--- a/arch/x86/lib/copy_user_64.S ++++ b/arch/x86/lib/copy_user_64.S +@@ -217,19 +217,19 @@ ENTRY(copy_user_generic_unrolled) + /* table sorted by exception address */ + .section __ex_table,"a" + .align 8 +- .quad .Ls1,.Ls1e +- .quad .Ls2,.Ls2e +- .quad .Ls3,.Ls3e +- .quad .Ls4,.Ls4e +- .quad .Ld1,.Ls1e ++ .quad .Ls1,.Ls1e /* Ls1-Ls4 have copied zero bytes */ ++ .quad .Ls2,.Ls1e ++ .quad .Ls3,.Ls1e ++ .quad .Ls4,.Ls1e ++ .quad .Ld1,.Ls1e /* Ld1-Ld4 have copied 0-24 bytes */ + .quad .Ld2,.Ls2e + .quad .Ld3,.Ls3e + .quad .Ld4,.Ls4e +- .quad .Ls5,.Ls5e +- .quad .Ls6,.Ls6e +- .quad .Ls7,.Ls7e +- .quad .Ls8,.Ls8e +- .quad .Ld5,.Ls5e ++ .quad .Ls5,.Ls5e /* Ls5-Ls8 have copied 32 bytes */ ++ .quad .Ls6,.Ls5e ++ .quad .Ls7,.Ls5e ++ .quad .Ls8,.Ls5e ++ .quad .Ld5,.Ls5e /* Ld5-Ld8 have copied 32-56 bytes */ + .quad .Ld6,.Ls6e + .quad .Ld7,.Ls7e + .quad .Ld8,.Ls8e +@@ -244,11 +244,8 @@ ENTRY(copy_user_generic_unrolled) + .quad .Le5,.Le_zero + .previous + +- /* compute 64-offset for main loop. 8 bytes accuracy with error on the +- pessimistic side. this is gross. it would be better to fix the +- interface. */ + /* eax: zero, ebx: 64 */ +-.Ls1e: addl $8,%eax ++.Ls1e: addl $8,%eax /* eax is bytes left uncopied within the loop (Ls1e: 64 .. Ls8e: 8) */ + .Ls2e: addl $8,%eax + .Ls3e: addl $8,%eax + .Ls4e: addl $8,%eax +diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S +index 5196762..9d3d1ab 100644 +--- a/arch/x86/lib/copy_user_nocache_64.S ++++ b/arch/x86/lib/copy_user_nocache_64.S +@@ -145,19 +145,19 @@ ENTRY(__copy_user_nocache) + /* table sorted by exception address */ + .section __ex_table,"a" + .align 8 +- .quad .Ls1,.Ls1e +- .quad .Ls2,.Ls2e +- .quad .Ls3,.Ls3e +- .quad .Ls4,.Ls4e +- .quad .Ld1,.Ls1e ++ .quad .Ls1,.Ls1e /* .Ls[1-4] - 0 bytes copied */ ++ .quad .Ls2,.Ls1e ++ .quad .Ls3,.Ls1e ++ .quad .Ls4,.Ls1e ++ .quad .Ld1,.Ls1e /* .Ld[1-4] - 0..24 bytes coped */ + .quad .Ld2,.Ls2e + .quad .Ld3,.Ls3e + .quad .Ld4,.Ls4e +- .quad .Ls5,.Ls5e +- .quad .Ls6,.Ls6e +- .quad .Ls7,.Ls7e +- .quad .Ls8,.Ls8e +- .quad .Ld5,.Ls5e ++ .quad .Ls5,.Ls5e /* .Ls[5-8] - 32 bytes copied */ ++ .quad .Ls6,.Ls5e ++ .quad .Ls7,.Ls5e ++ .quad .Ls8,.Ls5e ++ .quad .Ld5,.Ls5e /* .Ld[5-8] - 32..56 bytes copied */ + .quad .Ld6,.Ls6e + .quad .Ld7,.Ls7e + .quad .Ld8,.Ls8e +@@ -172,11 +172,8 @@ ENTRY(__copy_user_nocache) + .quad .Le5,.Le_zero + .previous + +- /* compute 64-offset for main loop. 8 bytes accuracy with error on the +- pessimistic side. this is gross. it would be better to fix the +- interface. */ + /* eax: zero, ebx: 64 */ +-.Ls1e: addl $8,%eax ++.Ls1e: addl $8,%eax /* eax: bytes left uncopied: Ls1e: 64 .. Ls8e: 8 */ + .Ls2e: addl $8,%eax + .Ls3e: addl $8,%eax + .Ls4e: addl $8,%eax +diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c +index 3bc0c67..225e88c 100644 +--- a/drivers/acpi/tables/tbinstal.c ++++ b/drivers/acpi/tables/tbinstal.c +@@ -123,17 +123,13 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, + } + } + +- /* The table must be either an SSDT or a PSDT or an OEMx */ +- +- if ((!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_PSDT)) +- && +- (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT)) +- && (strncmp(table_desc->pointer->signature, "OEM", 3))) { +- ACPI_ERROR((AE_INFO, +- "Table has invalid signature [%4.4s], must be SSDT, PSDT or OEMx", +- table_desc->pointer->signature)); +- return_ACPI_STATUS(AE_BAD_SIGNATURE); +- } ++ /* ++ * Originally, we checked the table signature for "SSDT" or "PSDT" here. ++ * Next, we added support for OEMx tables, signature "OEM". ++ * Valid tables were encountered with a null signature, so we've just ++ * given up on validating the signature, since it seems to be a waste ++ * of code. The original code was removed (05/2008). ++ */ + + (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES); + +diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c +index 46e8748..3eecbd4 100644 +--- a/drivers/ide/pci/opti621.c ++++ b/drivers/ide/pci/opti621.c +@@ -103,18 +103,6 @@ + * address: 50 ns, data: 50 ns, recovery: 100 ns. + */ + +-/* #define READ_PREFETCH 0 */ +-/* Uncomment for disable read prefetch. +- * There is some readprefetch capatibility in hdparm, +- * but when I type hdparm -P 1 /dev/hda, I got errors +- * and till reset drive is inaccessible. +- * This (hw) read prefetch is safe on my drive. +- */ +- +-#ifndef READ_PREFETCH +-#define READ_PREFETCH 0x40 /* read prefetch is enabled */ +-#endif /* else read prefetch is disabled */ +- + #define READ_REG 0 /* index of Read cycle timing register */ + #define WRITE_REG 1 /* index of Write cycle timing register */ + #define CNTRL_REG 3 /* index of Control register */ +@@ -260,7 +248,8 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) + + cycle1 = ((first.data_time-1)<<4) | (first.recovery_time-2); + cycle2 = ((second.data_time-1)<<4) | (second.recovery_time-2); +- misc = READ_PREFETCH | ((ax-1)<<4) | ((drdy-2)<<1); ++ ++ misc = ((ax - 1) << 4) | ((drdy - 2) << 1); + + #ifdef OPTI621_DEBUG + printk("%s: master: address: %d, data: %d, " +@@ -335,20 +324,16 @@ static const struct ide_port_info opti621_chipsets[] __devinitdata = { + .name = "OPTI621", + .init_hwif = init_hwif_opti621, + .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, +- .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | ++ .host_flags = IDE_HFLAG_NO_DMA | + IDE_HFLAG_BOOTABLE, + .pio_mask = ATA_PIO3, +- .swdma_mask = ATA_SWDMA2, +- .mwdma_mask = ATA_MWDMA2, + },{ /* 1 */ + .name = "OPTI621X", + .init_hwif = init_hwif_opti621, + .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, +- .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA | ++ .host_flags = IDE_HFLAG_NO_DMA | + IDE_HFLAG_BOOTABLE, + .pio_mask = ATA_PIO3, +- .swdma_mask = ATA_SWDMA2, +- .mwdma_mask = ATA_MWDMA2, + } + }; + +diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c +index 555b70c..2d31587 100644 +--- a/drivers/net/virtio_net.c ++++ b/drivers/net/virtio_net.c +@@ -83,9 +83,7 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, + BUG_ON(len > MAX_PACKET_LEN); + + skb_trim(skb, len); +- skb->protocol = eth_type_trans(skb, dev); +- pr_debug("Receiving skb proto 0x%04x len %i type %i\n", +- ntohs(skb->protocol), skb->len, skb->pkt_type); ++ + dev->stats.rx_bytes += skb->len; + dev->stats.rx_packets++; + +@@ -95,6 +93,10 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, + goto frame_err; + } + ++ skb->protocol = eth_type_trans(skb, dev); ++ pr_debug("Receiving skb proto 0x%04x len %i type %i\n", ++ ntohs(skb->protocol), skb->len, skb->pkt_type); ++ + if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) { + pr_debug("GSO!\n"); + switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) { +diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h +index 44ebdea..b14087b 100644 +--- a/drivers/net/wireless/b43/b43.h ++++ b/drivers/net/wireless/b43/b43.h +@@ -596,7 +596,6 @@ struct b43_dma { + + /* Context information for a noise calculation (Link Quality). */ + struct b43_noise_calculation { +- u8 channel_at_start; + bool calculation_running; + u8 nr_samples; + s8 samples[8][4]; +diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c +index 4ec1915..f74dba2 100644 +--- a/drivers/net/wireless/b43/dma.c ++++ b/drivers/net/wireless/b43/dma.c +@@ -850,6 +850,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, + if (!ring) + goto out; + ring->type = type; ++ ring->dev = dev; + + nr_slots = B43_RXRING_SLOTS; + if (for_tx) +@@ -901,7 +902,6 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, + DMA_TO_DEVICE); + } + +- ring->dev = dev; + ring->nr_slots = nr_slots; + ring->mmio_base = b43_dmacontroller_base(type, controller_index); + ring->index = controller_index; +diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c +index 6966eec..b4a2042 100644 +--- a/drivers/net/wireless/b43/main.c ++++ b/drivers/net/wireless/b43/main.c +@@ -1027,7 +1027,6 @@ static void b43_generate_noise_sample(struct b43_wldev *dev) + b43_jssi_write(dev, 0x7F7F7F7F); + b43_write32(dev, B43_MMIO_MACCMD, + b43_read32(dev, B43_MMIO_MACCMD) | B43_MACCMD_BGNOISE); +- B43_WARN_ON(dev->noisecalc.channel_at_start != dev->phy.channel); + } + + static void b43_calculate_link_quality(struct b43_wldev *dev) +@@ -1036,7 +1035,6 @@ static void b43_calculate_link_quality(struct b43_wldev *dev) + + if (dev->noisecalc.calculation_running) + return; +- dev->noisecalc.channel_at_start = dev->phy.channel; + dev->noisecalc.calculation_running = 1; + dev->noisecalc.nr_samples = 0; + +@@ -1053,9 +1051,16 @@ static void handle_irq_noise(struct b43_wldev *dev) + + /* Bottom half of Link Quality calculation. */ + ++ /* Possible race condition: It might be possible that the user ++ * changed to a different channel in the meantime since we ++ * started the calculation. We ignore that fact, since it's ++ * not really that much of a problem. The background noise is ++ * an estimation only anyway. Slightly wrong results will get damped ++ * by the averaging of the 8 sample rounds. Additionally the ++ * value is shortlived. So it will be replaced by the next noise ++ * calculation round soon. */ ++ + B43_WARN_ON(!dev->noisecalc.calculation_running); +- if (dev->noisecalc.channel_at_start != phy->channel) +- goto drop_calculation; + *((__le32 *)noise) = cpu_to_le32(b43_jssi_read(dev)); + if (noise[0] == 0x7F || noise[1] == 0x7F || + noise[2] == 0x7F || noise[3] == 0x7F) +@@ -1096,11 +1101,10 @@ static void handle_irq_noise(struct b43_wldev *dev) + average -= 48; + + dev->stats.link_noise = average; +- drop_calculation: + dev->noisecalc.calculation_running = 0; + return; + } +- generate_new: ++generate_new: + b43_generate_noise_sample(dev); + } + +diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c +index ed7e0a1..079c733 100644 +--- a/drivers/scsi/hosts.c ++++ b/drivers/scsi/hosts.c +@@ -455,9 +455,10 @@ struct Scsi_Host *scsi_host_lookup(unsigned short hostnum) + struct Scsi_Host *shost = ERR_PTR(-ENXIO); + + cdev = class_find_child(&shost_class, &hostnum, __scsi_host_match); +- if (cdev) ++ if (cdev) { + shost = scsi_host_get(class_to_shost(cdev)); +- ++ class_device_put(cdev); ++ } + return shost; + } + EXPORT_SYMBOL(scsi_host_lookup); +diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c +index 7ee86d4..c82df8b 100644 +--- a/drivers/scsi/sr.c ++++ b/drivers/scsi/sr.c +@@ -178,6 +178,9 @@ int sr_test_unit_ready(struct scsi_device *sdev, struct scsi_sense_hdr *sshdr) + the_result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, + 0, sshdr, SR_TIMEOUT, + retries--); ++ if (scsi_sense_valid(sshdr) && ++ sshdr->sense_key == UNIT_ATTENTION) ++ sdev->changed = 1; + + } while (retries > 0 && + (!scsi_status_is_good(the_result) || +diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c +index 77f7a7f..d60705e 100644 +--- a/drivers/serial/8250.c ++++ b/drivers/serial/8250.c +@@ -2174,7 +2174,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, + } + serial8250_set_mctrl(&up->port, up->port.mctrl); + spin_unlock_irqrestore(&up->port.lock, flags); +- tty_termios_encode_baud_rate(termios, baud, baud); ++ /* Don't rewrite B0 */ ++ if (tty_termios_baud_rate(termios)) ++ tty_termios_encode_baud_rate(termios, baud, baud); + } + + static void +diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c +index 4147de6..8785784 100644 +--- a/net/netfilter/nf_conntrack_core.c ++++ b/net/netfilter/nf_conntrack_core.c +@@ -199,8 +199,6 @@ destroy_conntrack(struct nf_conntrack *nfct) + if (l4proto && l4proto->destroy) + l4proto->destroy(ct); + +- nf_ct_ext_destroy(ct); +- + rcu_read_unlock(); + + spin_lock_bh(&nf_conntrack_lock); +@@ -523,6 +521,7 @@ static void nf_conntrack_free_rcu(struct rcu_head *head) + + void nf_conntrack_free(struct nf_conn *ct) + { ++ nf_ct_ext_destroy(ct); + call_rcu(&ct->rcu, nf_conntrack_free_rcu); + } + EXPORT_SYMBOL_GPL(nf_conntrack_free); +diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c +index 898f192..7407dd3 100644 +--- a/net/netfilter/nf_conntrack_h323_main.c ++++ b/net/netfilter/nf_conntrack_h323_main.c +@@ -617,6 +617,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_h245 __read_mostly = { + .me = THIS_MODULE, + .max_expected = H323_RTP_CHANNEL_MAX * 4 + 2 /* T.120 */, + .timeout = 240, ++ .tuple.src.l3num = AF_UNSPEC, + .tuple.dst.protonum = IPPROTO_UDP, + .help = h245_help + }; +@@ -1758,6 +1759,7 @@ static void __exit nf_conntrack_h323_fini(void) + nf_conntrack_helper_unregister(&nf_conntrack_helper_ras[0]); + nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[1]); + nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]); ++ nf_conntrack_helper_unregister(&nf_conntrack_helper_h245); + kfree(h323_buffer); + pr_debug("nf_ct_h323: fini\n"); + } +@@ -1770,28 +1772,34 @@ static int __init nf_conntrack_h323_init(void) + h323_buffer = kmalloc(65536, GFP_KERNEL); + if (!h323_buffer) + return -ENOMEM; +- ret = nf_conntrack_helper_register(&nf_conntrack_helper_q931[0]); ++ ret = nf_conntrack_helper_register(&nf_conntrack_helper_h245); + if (ret < 0) + goto err1; +- ret = nf_conntrack_helper_register(&nf_conntrack_helper_q931[1]); ++ ret = nf_conntrack_helper_register(&nf_conntrack_helper_q931[0]); + if (ret < 0) + goto err2; +- ret = nf_conntrack_helper_register(&nf_conntrack_helper_ras[0]); ++ ret = nf_conntrack_helper_register(&nf_conntrack_helper_q931[1]); + if (ret < 0) + goto err3; +- ret = nf_conntrack_helper_register(&nf_conntrack_helper_ras[1]); ++ ret = nf_conntrack_helper_register(&nf_conntrack_helper_ras[0]); + if (ret < 0) + goto err4; ++ ret = nf_conntrack_helper_register(&nf_conntrack_helper_ras[1]); ++ if (ret < 0) ++ goto err5; + pr_debug("nf_ct_h323: init success\n"); + return 0; + +-err4: ++err5: + nf_conntrack_helper_unregister(&nf_conntrack_helper_ras[0]); +-err3: ++err4: + nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[1]); +-err2: ++err3: + nf_conntrack_helper_unregister(&nf_conntrack_helper_q931[0]); ++err2: ++ nf_conntrack_helper_unregister(&nf_conntrack_helper_h245); + err1: ++ kfree(h323_buffer); + return ret; + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.kernel.org/patch-2.6.25.8-9 new/patches.kernel.org/patch-2.6.25.8-9 --- old/patches.kernel.org/patch-2.6.25.8-9 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kernel.org/patch-2.6.25.8-9 2008-06-25 00:31:41.000000000 +0200 @@ -0,0 +1,442 @@ +From: Greg Kroah-Hartman <gregkh(a)suse.de> +Subject: Linux 2.6.25.8 + +Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.d> + +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 25 +-EXTRAVERSION = .8 ++EXTRAVERSION = .9 + NAME = Funky Weasel is Jiggy wit it + + # *DOCUMENTATION* +diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c +index d3437c4..e3b2185 100644 +--- a/arch/powerpc/kernel/vdso.c ++++ b/arch/powerpc/kernel/vdso.c +@@ -141,7 +141,7 @@ static void dump_one_vdso_page(struct page *pg, struct page *upg) + printk("kpg: %p (c:%d,f:%08lx)", __va(page_to_pfn(pg) << PAGE_SHIFT), + page_count(pg), + pg->flags); +- if (upg/* && pg != upg*/) { ++ if (upg && !IS_ERR(upg) /* && pg != upg*/) { + printk(" upg: %p (c:%d,f:%08lx)", __va(page_to_pfn(upg) + << PAGE_SHIFT), + page_count(upg), +diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c +index 2b3e5d4..9ac056b 100644 +--- a/arch/x86/kernel/setup_32.c ++++ b/arch/x86/kernel/setup_32.c +@@ -483,10 +483,16 @@ static void __init reserve_crashkernel(void) + (unsigned long)(crash_size >> 20), + (unsigned long)(crash_base >> 20), + (unsigned long)(total_mem >> 20)); ++ ++ if (reserve_bootmem(crash_base, crash_size, ++ BOOTMEM_EXCLUSIVE) < 0) { ++ printk(KERN_INFO "crashkernel reservation " ++ "failed - memory is in use\n"); ++ return; ++ } ++ + crashk_res.start = crash_base; + crashk_res.end = crash_base + crash_size - 1; +- reserve_bootmem(crash_base, crash_size, +- BOOTMEM_DEFAULT); + } else + printk(KERN_INFO "crashkernel reservation failed - " + "you have to specify a base address\n"); +diff --git a/drivers/hwmon/adt7473.c b/drivers/hwmon/adt7473.c +index 9587869..8396e0f 100644 +--- a/drivers/hwmon/adt7473.c ++++ b/drivers/hwmon/adt7473.c +@@ -309,6 +309,9 @@ no_sensor_update: + ADT7473_REG_PWM_BHVR(i)); + } + ++ i = i2c_smbus_read_byte_data(client, ADT7473_REG_CFG4); ++ data->max_duty_at_overheat = !!(i & ADT7473_CFG4_MAX_DUTY_AT_OVT); ++ + data->limits_last_updated = local_jiffies; + data->limits_valid = 1; + +diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c +index 182fe6a..30bdd50 100644 +--- a/drivers/hwmon/lm85.c ++++ b/drivers/hwmon/lm85.c +@@ -192,7 +192,7 @@ static int RANGE_TO_REG( int range ) + { + int i; + +- if ( range < lm85_range_map[0] ) { ++ if (range <= lm85_range_map[0]) { + return 0 ; + } else if ( range > lm85_range_map[15] ) { + return 15 ; +diff --git a/drivers/net/atl1/atl1_hw.c b/drivers/net/atl1/atl1_hw.c +index 9d3bd22..a965f68 100644 +--- a/drivers/net/atl1/atl1_hw.c ++++ b/drivers/net/atl1/atl1_hw.c +@@ -250,7 +250,6 @@ static int atl1_get_permanent_address(struct atl1_hw *hw) + memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN); + return 0; + } +- return 1; + } + + /* see if SPI FLAGS exist ? */ +diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c +index 6483d10..2b756ef 100644 +--- a/drivers/watchdog/hpwdt.c ++++ b/drivers/watchdog/hpwdt.c +@@ -140,49 +140,52 @@ static struct pci_device_id hpwdt_devices[] = { + }; + MODULE_DEVICE_TABLE(pci, hpwdt_devices); + ++extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, unsigned long *pRomEntry); ++ + #ifndef CONFIG_X86_64 + /* --32 Bit Bios------------------------------------------------------------ */ + + #define HPWDT_ARCH 32 + +-static void asminline_call(struct cmn_registers *pi86Regs, +- unsigned long *pRomEntry) +-{ +- asm("pushl %ebp \n\t" +- "movl %esp, %ebp \n\t" +- "pusha \n\t" +- "pushf \n\t" +- "push %es \n\t" +- "push %ds \n\t" +- "pop %es \n\t" +- "movl 8(%ebp),%eax \n\t" +- "movl 4(%eax),%ebx \n\t" +- "movl 8(%eax),%ecx \n\t" +- "movl 12(%eax),%edx \n\t" +- "movl 16(%eax),%esi \n\t" +- "movl 20(%eax),%edi \n\t" +- "movl (%eax),%eax \n\t" +- "push %cs \n\t" +- "call *12(%ebp) \n\t" +- "pushf \n\t" +- "pushl %eax \n\t" +- "movl 8(%ebp),%eax \n\t" +- "movl %ebx,4(%eax) \n\t" +- "movl %ecx,8(%eax) \n\t" +- "movl %edx,12(%eax) \n\t" +- "movl %esi,16(%eax) \n\t" +- "movl %edi,20(%eax) \n\t" +- "movw %ds,24(%eax) \n\t" +- "movw %es,26(%eax) \n\t" +- "popl %ebx \n\t" +- "movl %ebx,(%eax) \n\t" +- "popl %ebx \n\t" +- "movl %ebx,28(%eax) \n\t" +- "pop %es \n\t" +- "popf \n\t" +- "popa \n\t" +- "leave \n\t" "ret"); +-} ++asm(".text \n\t" ++ ".align 4 \n" ++ "asminline_call: \n\t" ++ "pushl %ebp \n\t" ++ "movl %esp, %ebp \n\t" ++ "pusha \n\t" ++ "pushf \n\t" ++ "push %es \n\t" ++ "push %ds \n\t" ++ "pop %es \n\t" ++ "movl 8(%ebp),%eax \n\t" ++ "movl 4(%eax),%ebx \n\t" ++ "movl 8(%eax),%ecx \n\t" ++ "movl 12(%eax),%edx \n\t" ++ "movl 16(%eax),%esi \n\t" ++ "movl 20(%eax),%edi \n\t" ++ "movl (%eax),%eax \n\t" ++ "push %cs \n\t" ++ "call *12(%ebp) \n\t" ++ "pushf \n\t" ++ "pushl %eax \n\t" ++ "movl 8(%ebp),%eax \n\t" ++ "movl %ebx,4(%eax) \n\t" ++ "movl %ecx,8(%eax) \n\t" ++ "movl %edx,12(%eax) \n\t" ++ "movl %esi,16(%eax) \n\t" ++ "movl %edi,20(%eax) \n\t" ++ "movw %ds,24(%eax) \n\t" ++ "movw %es,26(%eax) \n\t" ++ "popl %ebx \n\t" ++ "movl %ebx,(%eax) \n\t" ++ "popl %ebx \n\t" ++ "movl %ebx,28(%eax) \n\t" ++ "pop %es \n\t" ++ "popf \n\t" ++ "popa \n\t" ++ "leave \n\t" ++ "ret \n\t" ++ ".previous"); + + /* + * cru_detect +@@ -333,43 +336,44 @@ static int __devinit detect_cru_service(void) + + #define HPWDT_ARCH 64 + +-static void asminline_call(struct cmn_registers *pi86Regs, +- unsigned long *pRomEntry) +-{ +- asm("pushq %rbp \n\t" +- "movq %rsp, %rbp \n\t" +- "pushq %rax \n\t" +- "pushq %rbx \n\t" +- "pushq %rdx \n\t" +- "pushq %r12 \n\t" +- "pushq %r9 \n\t" +- "movq %rsi, %r12 \n\t" +- "movq %rdi, %r9 \n\t" +- "movl 4(%r9),%ebx \n\t" +- "movl 8(%r9),%ecx \n\t" +- "movl 12(%r9),%edx \n\t" +- "movl 16(%r9),%esi \n\t" +- "movl 20(%r9),%edi \n\t" +- "movl (%r9),%eax \n\t" +- "call *%r12 \n\t" +- "pushfq \n\t" +- "popq %r12 \n\t" +- "popfq \n\t" +- "movl %eax, (%r9) \n\t" +- "movl %ebx, 4(%r9) \n\t" +- "movl %ecx, 8(%r9) \n\t" +- "movl %edx, 12(%r9) \n\t" +- "movl %esi, 16(%r9) \n\t" +- "movl %edi, 20(%r9) \n\t" +- "movq %r12, %rax \n\t" +- "movl %eax, 28(%r9) \n\t" +- "popq %r9 \n\t" +- "popq %r12 \n\t" +- "popq %rdx \n\t" +- "popq %rbx \n\t" +- "popq %rax \n\t" +- "leave \n\t" "ret"); +-} ++asm(".text \n\t" ++ ".align 4 \n" ++ "asminline_call: \n\t" ++ "pushq %rbp \n\t" ++ "movq %rsp, %rbp \n\t" ++ "pushq %rax \n\t" ++ "pushq %rbx \n\t" ++ "pushq %rdx \n\t" ++ "pushq %r12 \n\t" ++ "pushq %r9 \n\t" ++ "movq %rsi, %r12 \n\t" ++ "movq %rdi, %r9 \n\t" ++ "movl 4(%r9),%ebx \n\t" ++ "movl 8(%r9),%ecx \n\t" ++ "movl 12(%r9),%edx \n\t" ++ "movl 16(%r9),%esi \n\t" ++ "movl 20(%r9),%edi \n\t" ++ "movl (%r9),%eax \n\t" ++ "call *%r12 \n\t" ++ "pushfq \n\t" ++ "popq %r12 \n\t" ++ "popfq \n\t" ++ "movl %eax, (%r9) \n\t" ++ "movl %ebx, 4(%r9) \n\t" ++ "movl %ecx, 8(%r9) \n\t" ++ "movl %edx, 12(%r9) \n\t" ++ "movl %esi, 16(%r9) \n\t" ++ "movl %edi, 20(%r9) \n\t" ++ "movq %r12, %rax \n\t" ++ "movl %eax, 28(%r9) \n\t" ++ "popq %r9 \n\t" ++ "popq %r12 \n\t" ++ "popq %rdx \n\t" ++ "popq %rbx \n\t" ++ "popq %rax \n\t" ++ "leave \n\t" ++ "ret \n\t" ++ ".previous"); + + /* + * dmi_find_cru +diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h +index 5f7257f..8f8085b 100644 +--- a/include/asm-x86/page_32.h ++++ b/include/asm-x86/page_32.h +@@ -14,7 +14,8 @@ + #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) + + #ifdef CONFIG_X86_PAE +-#define __PHYSICAL_MASK_SHIFT 36 ++/* 44=32+12, the limit we can fit into an unsigned long pfn */ ++#define __PHYSICAL_MASK_SHIFT 44 + #define __VIRTUAL_MASK_SHIFT 32 + #define PAGETABLE_LEVELS 3 + +diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h +index 4e4e340..db3d837 100644 +--- a/include/linux/bootmem.h ++++ b/include/linux/bootmem.h +@@ -94,7 +94,7 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat, + unsigned long freepfn, + unsigned long startpfn, + unsigned long endpfn); +-extern void reserve_bootmem_node(pg_data_t *pgdat, ++extern int reserve_bootmem_node(pg_data_t *pgdat, + unsigned long physaddr, + unsigned long size, + int flags); +diff --git a/mm/bootmem.c b/mm/bootmem.c +index 2ccea70..8bb58da 100644 +--- a/mm/bootmem.c ++++ b/mm/bootmem.c +@@ -398,10 +398,10 @@ unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn, + return init_bootmem_core(pgdat, freepfn, startpfn, endpfn); + } + +-void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, ++int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, + unsigned long size, int flags) + { +- reserve_bootmem_core(pgdat->bdata, physaddr, size, flags); ++ return reserve_bootmem_core(pgdat->bdata, physaddr, size, flags); + } + + void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, +diff --git a/mm/memory.c b/mm/memory.c +index 0d14d1e..df84668 100644 +--- a/mm/memory.c ++++ b/mm/memory.c +@@ -943,17 +943,15 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address, + } + + ptep = pte_offset_map_lock(mm, pmd, address, &ptl); +- if (!ptep) +- goto out; + + pte = *ptep; + if (!pte_present(pte)) +- goto unlock; ++ goto no_page; + if ((flags & FOLL_WRITE) && !pte_write(pte)) + goto unlock; + page = vm_normal_page(vma, address, pte); + if (unlikely(!page)) +- goto unlock; ++ goto bad_page; + + if (flags & FOLL_GET) + get_page(page); +@@ -968,6 +966,15 @@ unlock: + out: + return page; + ++bad_page: ++ pte_unmap_unlock(ptep, ptl); ++ return ERR_PTR(-EFAULT); ++ ++no_page: ++ pte_unmap_unlock(ptep, ptl); ++ if (!pte_none(pte)) ++ return page; ++ /* Fall through to ZERO_PAGE handling */ + no_page_table: + /* + * When core dumping an enormous anonymous area that nobody +@@ -982,6 +989,26 @@ no_page_table: + return page; + } + ++/* Can we do the FOLL_ANON optimization? */ ++static inline int use_zero_page(struct vm_area_struct *vma) ++{ ++ /* ++ * We don't want to optimize FOLL_ANON for make_pages_present() ++ * when it tries to page in a VM_LOCKED region. As to VM_SHARED, ++ * we want to get the page from the page tables to make sure ++ * that we serialize and update with any other user of that ++ * mapping. ++ */ ++ if (vma->vm_flags & (VM_LOCKED | VM_SHARED)) ++ return 0; ++ /* ++ * And if we have a fault or a nopfn routine, it's not an ++ * anonymous region. ++ */ ++ return !vma->vm_ops || ++ (!vma->vm_ops->fault && !vma->vm_ops->nopfn); ++} ++ + int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, + unsigned long start, int len, int write, int force, + struct page **pages, struct vm_area_struct **vmas) +@@ -1056,9 +1083,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, + foll_flags = FOLL_TOUCH; + if (pages) + foll_flags |= FOLL_GET; +- if (!write && !(vma->vm_flags & VM_LOCKED) && +- (!vma->vm_ops || (!vma->vm_ops->nopage && +- !vma->vm_ops->fault))) ++ if (!write && use_zero_page(vma)) + foll_flags |= FOLL_ANON; + + do { +@@ -1104,6 +1129,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, + + cond_resched(); + } ++ if (IS_ERR(page)) ++ return i ? i : PTR_ERR(page); + if (pages) { + pages[i] = page; + +diff --git a/mm/migrate.c b/mm/migrate.c +index 4e0eccc..6acc815 100644 +--- a/mm/migrate.c ++++ b/mm/migrate.c +@@ -858,6 +858,11 @@ static int do_move_pages(struct mm_struct *mm, struct page_to_node *pm, + goto set_status; + + page = follow_page(vma, pp->addr, FOLL_GET); ++ ++ err = PTR_ERR(page); ++ if (IS_ERR(page)) ++ goto set_status; ++ + err = -ENOENT; + if (!page) + goto set_status; +@@ -921,6 +926,11 @@ static int do_pages_stat(struct mm_struct *mm, struct page_to_node *pm) + goto set_status; + + page = follow_page(vma, pm->addr, 0); ++ ++ err = PTR_ERR(page); ++ if (IS_ERR(page)) ++ goto set_status; ++ + err = -ENOENT; + /* Use PageReserved to check for zero page */ + if (!page || PageReserved(page)) +diff --git a/net/sctp/socket.c b/net/sctp/socket.c +index 998e63a..2d42260 100644 +--- a/net/sctp/socket.c ++++ b/net/sctp/socket.c +@@ -4421,7 +4421,9 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len, + if (copy_from_user(&getaddrs, optval, len)) + return -EFAULT; + +- if (getaddrs.addr_num <= 0) return -EINVAL; ++ if (getaddrs.addr_num <= 0 || ++ getaddrs.addr_num >= (INT_MAX / sizeof(union sctp_addr))) ++ return -EINVAL; + /* + * For UDP-style sockets, id specifies the association to query. + * If the id field is set to the value '0' then the locally bound ++++++ patches.rt.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/fix-adaptive-hack.patch new/patches.rt/fix-adaptive-hack.patch --- old/patches.rt/fix-adaptive-hack.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/fix-adaptive-hack.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,87 @@ +Subject: fix-adaptive-hack.patch +From: Thomas Gleixner <tglx(a)linutronix.de> +Date: Tue, 17 Jun 2008 18:01:12 +0200 + +Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> + +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> + +--- + kernel/rtmutex.c | 34 +++++++++------------------------- + 1 file changed, 9 insertions(+), 25 deletions(-) + +Index: linux-2.6.25.8-rt7/kernel/rtmutex.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex.c 2008-06-23 19:14:37.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex.c 2008-06-23 19:14:37.000000000 -0400 +@@ -774,41 +774,22 @@ update_current(unsigned long new_state, + static int adaptive_wait(struct rt_mutex_waiter *waiter, + struct task_struct *orig_owner) + { +- int sleep = 0; +- + for (;;) { + + /* we are the owner? */ + if (!waiter->task) +- break; ++ return 0; + +- /* +- * We need to read the owner of the lock and then check +- * its state. But we can't let the owner task be freed +- * while we read the state. We grab the rcu_lock and +- * this makes sure that the owner task wont disappear +- * between testing that it still has the lock, and checking +- * its state. +- */ +- rcu_read_lock(); + /* Owner changed? Then lets update the original */ +- if (orig_owner != rt_mutex_owner(waiter->lock)) { +- rcu_read_unlock(); +- break; +- } ++ if (orig_owner != rt_mutex_owner(waiter->lock)) ++ return 0; + + /* Owner went to bed, so should we */ +- if (!task_is_current(orig_owner)) { +- sleep = 1; +- rcu_read_unlock(); +- break; +- } +- rcu_read_unlock(); ++ if (!task_is_current(orig_owner)) ++ return 1; + + cpu_relax(); + } +- +- return sleep; + } + #else + static int adaptive_wait(struct rt_mutex_waiter *waiter, +@@ -889,11 +870,13 @@ rt_spin_lock_slowlock(struct rt_mutex *l + current->lock_depth = -1; + current->flags &= ~PF_NOSCHED; + orig_owner = rt_mutex_owner(lock); ++ get_task_struct(orig_owner); + spin_unlock_irqrestore(&lock->wait_lock, flags); + + debug_rt_mutex_print_deadlock(&waiter); + + if (adaptive_wait(&waiter, orig_owner)) { ++ put_task_struct(orig_owner); + update_current(TASK_UNINTERRUPTIBLE, &saved_state); + /* + * The xchg() in update_current() is an implicit +@@ -902,7 +885,8 @@ rt_spin_lock_slowlock(struct rt_mutex *l + */ + if (waiter.task) + schedule_rt_mutex(lock); +- } ++ } else ++ put_task_struct(orig_owner); + + spin_lock_irqsave(&lock->wait_lock, flags); + current->flags |= saved_flags; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/ftrace-stop-trace-on-crash.patch new/patches.rt/ftrace-stop-trace-on-crash.patch --- old/patches.rt/ftrace-stop-trace-on-crash.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/ftrace-stop-trace-on-crash.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,158 @@ +Subject: fix-tracer-wreckage-wtf-is-this-code-all-features.patch +From: Thomas Gleixner <tglx(a)linutronix.de> +Date: Thu, 19 Jun 2008 19:24:14 +0200 + +Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> + +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> + +--- + arch/x86/kernel/traps_32.c | 2 ++ + arch/x86/kernel/traps_64.c | 3 +++ + include/linux/ftrace.h | 11 ++++++++--- + kernel/trace/ftrace.c | 17 +++++++++++++++++ + kernel/trace/trace.c | 31 +++++++++++++++++++++++++++++++ + 5 files changed, 61 insertions(+), 3 deletions(-) + +Index: linux-2.6.25.8-rt7/arch/x86/kernel/traps_64.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/arch/x86/kernel/traps_64.c 2008-06-23 19:14:12.000000000 -0400 ++++ linux-2.6.25.8-rt7/arch/x86/kernel/traps_64.c 2008-06-23 19:14:38.000000000 -0400 +@@ -573,6 +573,9 @@ void __kprobes oops_end(unsigned long fl + int __kprobes __die(const char * str, struct pt_regs * regs, long err) + { + static int die_counter; ++ ++ ftrace_stop(); ++ + printk(KERN_EMERG "%s: %04lx [%u] ", str, err & 0xffff,++die_counter); + #ifdef CONFIG_PREEMPT + printk("PREEMPT "); +Index: linux-2.6.25.8-rt7/include/linux/ftrace.h +=================================================================== +--- linux-2.6.25.8-rt7.orig/include/linux/ftrace.h 2008-06-23 19:14:36.000000000 -0400 ++++ linux-2.6.25.8-rt7/include/linux/ftrace.h 2008-06-23 19:14:38.000000000 -0400 +@@ -38,12 +38,18 @@ extern void mcount(void); + void ftrace_enable(void); + void ftrace_disable(void); + ++/* totally disable ftrace - can not re-enable after this */ ++void ftrace_kill(void); ++void __ftrace_kill(void); ++ + #else /* !CONFIG_FTRACE */ + # define register_ftrace_function(ops) do { } while (0) + # define unregister_ftrace_function(ops) do { } while (0) + # define clear_ftrace_function(ops) do { } while (0) + # define ftrace_enable() do { } while (0) + # define ftrace_disable() do { } while (0) ++# define ftrace_kill() do { } while (0) ++# define __ftrace_kill() do { } while (0) + #endif /* CONFIG_FTRACE */ + + #ifdef CONFIG_DYNAMIC_FTRACE +@@ -90,9 +96,6 @@ void ftrace_enable_daemon(void); + # define ftrace_enable_daemon() do { } while (0) + #endif + +-/* totally disable ftrace - can not re-enable after this */ +-void ftrace_kill(void); +- + static inline void tracer_disable(void) + { + #ifdef CONFIG_FTRACE +@@ -138,9 +141,11 @@ static inline void tracer_disable(void) + #ifdef CONFIG_TRACING + extern void + ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3); ++void ftrace_stop(void); + #else + static inline void + ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) { } ++static inline void ftrace_stop(void) { } + #endif + + #ifdef CONFIG_EVENT_TRACER +Index: linux-2.6.25.8-rt7/kernel/trace/ftrace.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/trace/ftrace.c 2008-06-23 19:14:36.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/trace/ftrace.c 2008-06-23 19:14:38.000000000 -0400 +@@ -1490,6 +1490,23 @@ void ftrace_kill(void) + } + + /** ++ * __ftrace_kill - shutdown ftrace in a mean fashion ++ * ++ * In case of system failure we want to stop ftrace as soon as ++ * possible. This is like ftrace_kill but does not grab the ++ * mutexes nor does it call the kstop machine. ++ * ++ * This one is save to use in atomic. ++ */ ++void __ftrace_kill(void) ++{ ++ ftrace_disabled = 1; ++ ftrace_enabled = 0; ++ ++ clear_ftrace_function(); ++} ++ ++/** + * register_ftrace_function - register a function for profiling + * @ops - ops structure that holds the function for profiling. + * +Index: linux-2.6.25.8-rt7/kernel/trace/trace.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/trace/trace.c 2008-06-23 19:14:35.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/trace/trace.c 2008-06-23 19:14:38.000000000 -0400 +@@ -3258,6 +3258,37 @@ static __init void tracer_init_debugfs(v + #endif + } + ++/** ++ * ftrace_stop - called when we need to drastically disable the tracer. ++ */ ++void ftrace_stop(void) ++{ ++ struct tracer *saved_tracer = current_trace; ++ struct trace_array *tr = &global_trace; ++ struct trace_array_cpu *data; ++ int i; ++ ++ __ftrace_kill(); ++ for_each_tracing_cpu(i) { ++ data = tr->data[i]; ++ atomic_inc(&data->disabled); ++ } ++ tracer_enabled = 0; ++ ++ /* ++ * TODO: make a safe method to ctrl_update. ++ * ctrl_update may schedule, but currently only ++ * does when ftrace is enabled. ++ */ ++ if (tr->ctrl) { ++ tr->ctrl = 0; ++ if (saved_tracer && saved_tracer->ctrl_update) ++ saved_tracer->ctrl_update; ++ } ++ ++ ++} ++ + static int trace_alloc_page(void) + { + struct trace_array_cpu *data; +Index: linux-2.6.25.8-rt7/arch/x86/kernel/traps_32.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/arch/x86/kernel/traps_32.c 2008-06-23 19:14:34.000000000 -0400 ++++ linux-2.6.25.8-rt7/arch/x86/kernel/traps_32.c 2008-06-23 19:14:38.000000000 -0400 +@@ -398,6 +398,8 @@ int __kprobes __die(const char * str, st + unsigned long sp; + unsigned short ss; + ++ ftrace_stop(); ++ + printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); + #ifdef CONFIG_PREEMPT + printk("PREEMPT "); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/futex-fix-fault-damage.patch new/patches.rt/futex-fix-fault-damage.patch --- old/patches.rt/futex-fix-fault-damage.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/futex-fix-fault-damage.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,154 @@ +Subject: futex-fix-fault-damage.patch +From: Thomas Gleixner <tglx(a)linutronix.de> +Date: Sat, 21 Jun 2008 09:09:44 +0200 + +Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> + +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> + +--- + kernel/futex.c | 93 ++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 73 insertions(+), 20 deletions(-) + +Index: linux-2.6.25.8-rt7/kernel/futex.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/futex.c 2008-06-23 19:14:10.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/futex.c 2008-06-23 19:14:39.000000000 -0400 +@@ -1128,21 +1128,64 @@ static void unqueue_me_pi(struct futex_q + * private futexes. + */ + static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q, +- struct task_struct *newowner) ++ struct task_struct *newowner, ++ struct rw_semaphore *fshared) + { + u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS; + struct futex_pi_state *pi_state = q->pi_state; ++ struct task_struct *oldowner = pi_state->owner; + u32 uval, curval, newval; +- int ret; ++ int ret, attempt = 0; + + /* Owner died? */ ++ if (!pi_state->owner) ++ newtid |= FUTEX_OWNER_DIED; ++ ++ /* ++ * We are here either because we stole the rtmutex from the ++ * pending owner or we are the pending owner which failed to ++ * get the rtmutex. We have to replace the pending owner TID ++ * in the user space variable. This must be atomic as we have ++ * preserve the owner died bit here. ++ * ++ * Note: We write the user space value _before_ changing the ++ * pi_state because we can fault here. Imagine swapped out ++ * pages or a fork, which was running right before we acquired ++ * mmap_sem, that marked all the anonymous memory readonly for ++ * cow. ++ * ++ * Modifying pi_state _before_ the user space value would ++ * leave the pi_state in an inconsistent state when we fault ++ * here, because we need to drop the hash bucket lock to ++ * handle the fault. This might be observed in the PID check ++ * in lookup_pi_state. ++ */ ++retry: ++ if (get_futex_value_locked(&uval, uaddr)) ++ goto handle_fault; ++ ++ while (1) { ++ newval = (uval & FUTEX_OWNER_DIED) | newtid; ++ ++ curval = cmpxchg_futex_value_locked(uaddr, uval, newval); ++ ++ if (curval == -EFAULT) ++ goto handle_fault; ++ if (curval == uval) ++ break; ++ uval = curval; ++ } ++ ++ /* ++ * We fixed up user space. Now we need to fix the pi_state ++ * itself. ++ */ + if (pi_state->owner != NULL) { + spin_lock_irq(&pi_state->owner->pi_lock); + WARN_ON(list_empty(&pi_state->list)); + list_del_init(&pi_state->list); + spin_unlock_irq(&pi_state->owner->pi_lock); +- } else +- newtid |= FUTEX_OWNER_DIED; ++ } + + pi_state->owner = newowner; + +@@ -1150,26 +1193,35 @@ static int fixup_pi_state_owner(u32 __us + WARN_ON(!list_empty(&pi_state->list)); + list_add(&pi_state->list, &newowner->pi_state_list); + spin_unlock_irq(&newowner->pi_lock); ++ return 0; + + /* +- * We own it, so we have to replace the pending owner +- * TID. This must be atomic as we have preserve the +- * owner died bit here. ++ * To handle the page fault we need to drop the hash bucket ++ * lock here. That gives the other task (either the pending ++ * owner itself or the task which stole the rtmutex) the ++ * chance to try the fixup of the pi_state. So once we are ++ * back from handling the fault we need to check the pi_state ++ * after reacquiring the hash bucket lock and before trying to ++ * do another fixup. When the fixup has been done already we ++ * simply return. + */ +- ret = get_futex_value_locked(&uval, uaddr); ++handle_fault: ++ spin_unlock(q->lock_ptr); + +- while (!ret) { +- newval = (uval & FUTEX_OWNER_DIED) | newtid; ++ ret = futex_handle_fault((unsigned long)uaddr, fshared, attempt++); + +- curval = cmpxchg_futex_value_locked(uaddr, uval, newval); ++ spin_lock(q->lock_ptr); + +- if (curval == -EFAULT) +- ret = -EFAULT; +- if (curval == uval) +- break; +- uval = curval; +- } +- return ret; ++ /* ++ * Check if someone else fixed it for us: ++ */ ++ if (pi_state->owner != oldowner) ++ return 0; ++ ++ if (ret) ++ return ret; ++ ++ goto retry; + } + + /* +@@ -1540,7 +1592,7 @@ static int futex_lock_pi(u32 __user *uad + * that case: + */ + if (q.pi_state->owner != curr) +- ret = fixup_pi_state_owner(uaddr, &q, curr); ++ ret = fixup_pi_state_owner(uaddr, &q, curr, fshared); + } else { + /* + * Catch the rare case, where the lock was released +@@ -1572,7 +1624,8 @@ static int futex_lock_pi(u32 __user *uad + int res; + + owner = rt_mutex_owner(&q.pi_state->pi_mutex); +- res = fixup_pi_state_owner(uaddr, &q, owner); ++ res = fixup_pi_state_owner(uaddr, &q, owner, ++ fshared); + + /* propagate -EFAULT, if the fixup failed */ + if (res) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/rtmutex-debug-fix.patch new/patches.rt/rtmutex-debug-fix.patch --- old/patches.rt/rtmutex-debug-fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/rtmutex-debug-fix.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,26 @@ +Subject: rtmutex-debug-fix.patch +From: Thomas Gleixner <tglx(a)linutronix.de> +Date: Fri, 20 Jun 2008 12:27:50 +0200 + +Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> + +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> + +--- + kernel/rtmutex-debug.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: linux-2.6.25.8-rt7/kernel/rtmutex-debug.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex-debug.c 2008-06-23 19:13:27.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex-debug.c 2008-06-23 19:14:38.000000000 -0400 +@@ -59,6 +59,9 @@ void rt_mutex_debug_task_free(struct tas + { + DEBUG_LOCKS_WARN_ON(!plist_head_empty(&task->pi_waiters)); + DEBUG_LOCKS_WARN_ON(task->pi_blocked_on); ++#ifdef CONFIG_PREEMPT_RT ++ WARN_ON(task->reader_lock_count); ++#endif + } + + /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/rt-mutex-namespace.patch new/patches.rt/rt-mutex-namespace.patch --- old/patches.rt/rt-mutex-namespace.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/rt-mutex-namespace.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,141 @@ +Subject: rt-mutex-namespace.patch +From: Thomas Gleixner <tglx(a)linutronix.de> +Date: Fri, 20 Jun 2008 12:22:52 +0200 + +Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> + +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> + +--- + kernel/rtmutex.c | 21 ++++++++++++--------- + kernel/rtmutex_common.h | 18 ++++++++++-------- + 2 files changed, 22 insertions(+), 17 deletions(-) + +Index: linux-2.6.25.8-rt7/kernel/rtmutex.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex.c 2008-06-23 19:14:38.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex.c 2008-06-23 19:14:38.000000000 -0400 +@@ -1291,7 +1291,7 @@ try_to_take_rw_write(struct rw_mutex *rw + } + + /* +- * RT_RW_PENDING means that the lock is free, but there are ++ * RT_RWLOCK_PENDING means that the lock is free, but there are + * pending owners on the mutex + */ + WARN_ON(own && !rt_mutex_owner_pending(mutex)); +@@ -1627,7 +1627,8 @@ static inline void + rt_write_fastlock(struct rw_mutex *rwm, + void (*slowfn)(struct rw_mutex *rwm, int mtx), int mtx) + { +- struct task_struct *val = (void *)((unsigned long)current | RT_RWLOCK_WRITER); ++ struct task_struct *val = (void *)((unsigned long)current | ++ RT_RWLOCK_WRITER); + + if (likely(rt_rwlock_cmpxchg(rwm, NULL, val))) + rt_mutex_deadlock_account_lock(&rwm->mutex, current); +@@ -1667,7 +1668,8 @@ static inline int + rt_write_fasttrylock(struct rw_mutex *rwm, + int (*slowfn)(struct rw_mutex *rwm, int mtx), int mtx) + { +- struct task_struct *val = (void *)((unsigned long)current | RT_RWLOCK_WRITER); ++ struct task_struct *val = (void *)((unsigned long)current | ++ RT_RWLOCK_WRITER); + + if (likely(rt_rwlock_cmpxchg(rwm, NULL, val))) { + rt_mutex_deadlock_account_lock(&rwm->mutex, current); +@@ -1760,7 +1762,7 @@ rt_read_slowunlock(struct rw_mutex *rwm, + /* We could still have a pending reader waiting */ + if (rt_mutex_owner_pending(mutex)) { + /* set the rwm back to pending */ +- rwm->owner = RT_RW_PENDING_READ; ++ rwm->owner = RT_RWLOCK_PENDING_READ; + } else { + rwm->owner = NULL; + mutex->owner = NULL; +@@ -1781,7 +1783,7 @@ rt_read_slowunlock(struct rw_mutex *rwm, + /* only wake up if there are no readers */ + if (reader_count) + goto out; +- rwm->owner = RT_RW_PENDING_WRITE; ++ rwm->owner = RT_RWLOCK_PENDING_WRITE; + } else { + /* + * It is also possible that the reader limit decreased. +@@ -1792,7 +1794,7 @@ rt_read_slowunlock(struct rw_mutex *rwm, + unlikely(atomic_read(&rwm->owners) >= rt_rwlock_limit)) + goto out; + if (!reader_count) +- rwm->owner = RT_RW_PENDING_READ; ++ rwm->owner = RT_RWLOCK_PENDING_READ; + } + + pendowner = waiter->task; +@@ -1916,11 +1918,11 @@ rt_write_slowunlock(struct rw_mutex *rwm + + /* another writer is next? */ + if (waiter->write_lock) { +- rwm->owner = RT_RW_PENDING_WRITE; ++ rwm->owner = RT_RWLOCK_PENDING_WRITE; + goto out; + } + +- rwm->owner = RT_RW_PENDING_READ; ++ rwm->owner = RT_RWLOCK_PENDING_READ; + + if (!rt_mutex_has_waiters(mutex)) + goto out; +@@ -1994,7 +1996,8 @@ static inline void + rt_write_fastunlock(struct rw_mutex *rwm, + void (*slowfn)(struct rw_mutex *rwm, int mtx), int mtx) + { +- struct task_struct *val = (void *)((unsigned long)current | RT_RWLOCK_WRITER); ++ struct task_struct *val = (void *)((unsigned long)current | ++ RT_RWLOCK_WRITER); + + WARN_ON(rt_rwlock_owner(rwm) != current); + if (likely(rt_rwlock_cmpxchg(rwm, (struct task_struct *)val, NULL))) +Index: linux-2.6.25.8-rt7/kernel/rtmutex_common.h +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex_common.h 2008-06-23 19:14:27.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex_common.h 2008-06-23 19:14:38.000000000 -0400 +@@ -123,29 +123,31 @@ static inline unsigned long rt_mutex_own + #define RT_RWLOCK_WRITER 2UL + #define RT_RWLOCK_MASKALL 3UL + +-/* used as reader owner of the mutex */ +-#define RT_RW_READER (struct task_struct *)0x100 +- + /* used when a writer releases the lock with waiters */ + /* pending owner is a reader */ +-#define RT_RW_PENDING_READ (struct task_struct *)0x200 ++#define RT_RWLOCK_PENDING_READ ((struct task_struct *)0x200) + /* pending owner is a writer */ +-#define RT_RW_PENDING_WRITE (struct task_struct *)0x400 ++#define RT_RWLOCK_PENDING_WRITE ((struct task_struct *)0x400) + /* Either of the above is true */ +-#define RT_RW_PENDING_MASK (0x600 | RT_RWLOCK_MASKALL) ++#define RT_RWLOCK_PENDING_MASK \ ++ ((unsigned long) RT_RWLOCK_PENDING_READ | \ ++ (unsigned long) RT_RWLOCK_PENDING_WRITE | RT_RWLOCK_MASKALL) ++ ++/* used as reader owner of the rt_mutex inside of the rw_mutex */ ++#define RT_RW_READER (struct task_struct *)0x100 + + /* Return true if lock is not owned but has pending owners */ + static inline int rt_rwlock_pending(struct rw_mutex *rwm) + { + unsigned long owner = (unsigned long)rwm->owner; +- return (owner & RT_RW_PENDING_MASK) == owner; ++ return (owner & RT_RWLOCK_PENDING_MASK) == owner; + } + + static inline int rt_rwlock_pending_writer(struct rw_mutex *rwm) + { + unsigned long owner = (unsigned long)rwm->owner; + return rt_rwlock_pending(rwm) && +- (owner & (unsigned long)RT_RW_PENDING_WRITE); ++ (owner & (unsigned long)RT_RWLOCK_PENDING_WRITE); + } + + static inline struct task_struct *rt_rwlock_owner(struct rw_mutex *rwm) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/rt-mutex-use-inline.patch new/patches.rt/rt-mutex-use-inline.patch --- old/patches.rt/rt-mutex-use-inline.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/rt-mutex-use-inline.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,31 @@ +Subject: rt-mutex-cleanup.patch +From: Thomas Gleixner <tglx(a)linutronix.de> +Date: Fri, 20 Jun 2008 12:20:09 +0200 + +Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> + +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> + +--- + kernel/rtmutex.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +Index: linux-2.6.25.8-rt7/kernel/rtmutex.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex.c 2008-06-23 19:14:37.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex.c 2008-06-23 19:14:38.000000000 -0400 +@@ -124,9 +124,12 @@ static inline void mark_rt_rwlock_check( + #endif + + #ifdef CONFIG_PREEMPT_RT +-#define task_is_reader(task) ((task) == RT_RW_READER) ++static inline int task_is_reader(struct task_struct *task) ++{ ++ return task == RT_RW_READER; ++} + #else +-#define task_is_reader(task) (0) ++static inline int task_is_reader(struct task_struct *task) { return 0; } + #endif + + int pi_initialized; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/rwlock-pi-lock-reader.patch new/patches.rt/rwlock-pi-lock-reader.patch --- old/patches.rt/rwlock-pi-lock-reader.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/rwlock-pi-lock-reader.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,101 @@ +Subject: Linux-RT 2.6.25.8-RT7 +From: http://www.kernel.org/pub/linux/kernel/projects/rt/ +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> +--- + kernel/rtmutex.c | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +Index: linux-2.6.25.8-rt7/kernel/rtmutex.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex.c 2008-06-23 19:14:35.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex.c 2008-06-23 19:14:37.000000000 -0400 +@@ -1915,7 +1915,6 @@ rt_write_slowunlock(struct rw_mutex *rwm + if (!rt_mutex_has_waiters(mutex)) + goto out; + +- spin_lock(&pendowner->pi_lock); + /* + * Wake up all readers. + * This gets a bit more complex. More than one reader can't +@@ -1930,13 +1929,17 @@ rt_write_slowunlock(struct rw_mutex *rwm + while (waiter && !waiter->write_lock) { + struct task_struct *reader = waiter->task; + ++ spin_lock(&pendowner->pi_lock); + plist_del(&waiter->list_entry, &mutex->wait_list); + + /* nop if not on a list */ + plist_del(&waiter->pi_list_entry, &pendowner->pi_waiters); ++ spin_unlock(&pendowner->pi_lock); + ++ spin_lock(&reader->pi_lock); + waiter->task = NULL; + reader->pi_blocked_on = NULL; ++ spin_unlock(&reader->pi_lock); + + if (savestate) + wake_up_process_mutex(reader); +@@ -1954,6 +1957,8 @@ rt_write_slowunlock(struct rw_mutex *rwm + struct rt_mutex_waiter *next; + + next = rt_mutex_top_waiter(mutex); ++ ++ spin_lock(&pendowner->pi_lock); + /* delete incase we didn't go through the loop */ + plist_del(&next->pi_list_entry, &pendowner->pi_waiters); + +@@ -1961,13 +1966,12 @@ rt_write_slowunlock(struct rw_mutex *rwm + if (next->write_lock) + /* add back in as top waiter */ + plist_add(&next->pi_list_entry, &pendowner->pi_waiters); ++ spin_unlock(&pendowner->pi_lock); + + rwm->prio = next->task->prio; + } else + rwm->prio = MAX_PRIO; + +- spin_unlock(&pendowner->pi_lock); +- + out: + + spin_unlock_irqrestore(&mutex->wait_lock, flags); +@@ -2047,18 +2051,21 @@ rt_mutex_downgrade_write(struct rw_mutex + * waiting, until we hit the reader limit, or a writer. + */ + +- spin_lock(&current->pi_lock); + waiter = rt_mutex_top_waiter(mutex); + while (waiter && !waiter->write_lock) { + struct task_struct *reader = waiter->task; + ++ spin_lock(&current->pi_lock); + plist_del(&waiter->list_entry, &mutex->wait_list); + + /* nop if not on a list */ + plist_del(&waiter->pi_list_entry, &current->pi_waiters); ++ spin_unlock(&current->pi_lock); + ++ spin_lock(&reader->pi_lock); + waiter->task = NULL; + reader->pi_blocked_on = NULL; ++ spin_unlock(&reader->pi_lock); + + /* downgrade is only for mutexes */ + wake_up_process(reader); +@@ -2078,14 +2085,14 @@ rt_mutex_downgrade_write(struct rw_mutex + /* setup this mutex prio for read */ + rwm->prio = next->task->prio; + ++ spin_lock(&current->pi_lock); + /* delete incase we didn't go through the loop */ + plist_del(&next->pi_list_entry, &current->pi_waiters); ++ spin_unlock(&current->pi_lock); + /* No need to add back since readers don't have PI waiters */ + } else + rwm->prio = MAX_PRIO; + +- spin_unlock(&current->pi_lock); +- + rt_mutex_set_owner(mutex, RT_RW_READER, 0); + + spin_unlock_irqrestore(&mutex->wait_lock, flags); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/rwlock-protect-reader_lock_count.patch new/patches.rt/rwlock-protect-reader_lock_count.patch --- old/patches.rt/rwlock-protect-reader_lock_count.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/rwlock-protect-reader_lock_count.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,135 @@ +Subject: Linux-RT 2.6.25.8-RT7 +From: http://www.kernel.org/pub/linux/kernel/projects/rt/ +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> +--- + kernel/rtmutex.c | 35 ++++++++++++++++++++++++++++------- + 1 file changed, 28 insertions(+), 7 deletions(-) + +Index: linux-2.6.25.8-rt7/kernel/rtmutex.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex.c 2008-06-23 19:14:38.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex.c 2008-06-23 19:14:38.000000000 -0400 +@@ -1137,6 +1137,12 @@ rt_rwlock_update_owner(struct rw_mutex * + if (own == RT_RW_READER) + return; + ++ /* ++ * We don't need to grab the pi_lock to look at the reader list ++ * since we hold the rwm wait_lock. We only care about the pointer ++ * to this lock, and we own the wait_lock, so that pointer ++ * can't be changed. ++ */ + for (i = own->reader_lock_count - 1; i >= 0; i--) { + if (own->owned_read_locks[i].lock == rwm) + break; +@@ -1256,6 +1262,7 @@ static int try_to_take_rw_read(struct rw + if (incr) { + atomic_inc(&rwm->owners); + rw_check_held(rwm); ++ spin_lock(&current->pi_lock); + reader_count = current->reader_lock_count++; + if (likely(reader_count < MAX_RWLOCK_DEPTH)) { + rls = &current->owned_read_locks[reader_count]; +@@ -1265,6 +1272,7 @@ static int try_to_take_rw_read(struct rw + list_add(&rls->list, &rwm->readers); + } else + WARN_ON_ONCE(1); ++ spin_unlock(&current->pi_lock); + } + rt_mutex_deadlock_account_lock(mutex, current); + atomic_inc(&rwm->count); +@@ -1420,6 +1428,7 @@ __rt_read_fasttrylock(struct rw_mutex *r + retry: + if (likely(rt_rwlock_cmpxchg(rwm, NULL, current))) { + int reader_count; ++ unsigned long flags; + + rt_mutex_deadlock_account_lock(&rwm->mutex, current); + atomic_inc(&rwm->count); +@@ -1436,30 +1445,31 @@ __rt_read_fasttrylock(struct rw_mutex *r + + atomic_inc(&rwm->owners); + rw_check_held(rwm); +- reader_count = current->reader_lock_count; ++ local_irq_save(flags); ++ spin_lock(&current->pi_lock); ++ reader_count = current->reader_lock_count++; + if (likely(reader_count < MAX_RWLOCK_DEPTH)) { + current->owned_read_locks[reader_count].lock = rwm; + current->owned_read_locks[reader_count].count = 1; + } else + WARN_ON_ONCE(1); ++ spin_unlock(&current->pi_lock); + /* + * If this task is no longer the sole owner of the lock + * or someone is blocking, then we need to add the task + * to the lock. + */ +- smp_mb(); +- current->reader_lock_count++; + if (unlikely(rwm->owner != current)) { + struct rt_mutex *mutex = &rwm->mutex; + struct reader_lock_struct *rls; +- unsigned long flags; + +- spin_lock_irqsave(&mutex->wait_lock, flags); ++ spin_lock(&mutex->wait_lock); + rls = &current->owned_read_locks[reader_count]; + if (!rls->list.prev || list_empty(&rls->list)) + list_add(&rls->list, &rwm->readers); +- spin_unlock_irqrestore(&mutex->wait_lock, flags); ++ spin_unlock(&mutex->wait_lock); + } ++ local_irq_restore(flags); + return 1; + } + return 0; +@@ -1710,6 +1720,7 @@ rt_read_slowunlock(struct rw_mutex *rwm, + + for (i = current->reader_lock_count - 1; i >= 0; i--) { + if (current->owned_read_locks[i].lock == rwm) { ++ spin_lock(&current->pi_lock); + current->owned_read_locks[i].count--; + if (!current->owned_read_locks[i].count) { + current->reader_lock_count--; +@@ -1721,6 +1732,7 @@ rt_read_slowunlock(struct rw_mutex *rwm, + rls->lock = NULL; + rw_check_held(rwm); + } ++ spin_unlock(&current->pi_lock); + break; + } + } +@@ -1845,8 +1857,14 @@ rt_read_fastunlock(struct rw_mutex *rwm, + atomic_dec(&rwm->count); + if (likely(rt_rwlock_cmpxchg(rwm, current, NULL))) { + struct reader_lock_struct *rls; +- int reader_count = --current->reader_lock_count; ++ unsigned long flags; ++ int reader_count; + int owners; ++ ++ spin_lock_irqsave(&current->pi_lock, flags); ++ reader_count = --current->reader_lock_count; ++ spin_unlock_irqrestore(&current->pi_lock, flags); ++ + rt_mutex_deadlock_account_unlock(current); + if (unlikely(reader_count < 0)) { + reader_count = 0; +@@ -2036,6 +2054,8 @@ rt_mutex_downgrade_write(struct rw_mutex + atomic_inc(&rwm->count); + atomic_inc(&rwm->owners); + rw_check_held(rwm); ++ ++ spin_lock(&current->pi_lock); + reader_count = current->reader_lock_count++; + rls = &current->owned_read_locks[reader_count]; + if (likely(reader_count < MAX_RWLOCK_DEPTH)) { +@@ -2043,6 +2063,7 @@ rt_mutex_downgrade_write(struct rw_mutex + rls->count = 1; + } else + WARN_ON_ONCE(1); ++ spin_unlock(&current->pi_lock); + + if (!rt_mutex_has_waiters(mutex)) { + /* We are sole owner, we are done */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/rwlock-slowunlock-mutex-fix2.patch new/patches.rt/rwlock-slowunlock-mutex-fix2.patch --- old/patches.rt/rwlock-slowunlock-mutex-fix2.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/rwlock-slowunlock-mutex-fix2.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,45 @@ +Subject: Linux-RT 2.6.25.8-RT7 +From: http://www.kernel.org/pub/linux/kernel/projects/rt/ +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> +--- + kernel/rtmutex.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +Index: linux-2.6.25.8-rt7/kernel/rtmutex.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex.c 2008-06-23 19:14:37.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex.c 2008-06-23 19:14:37.000000000 -0400 +@@ -1683,6 +1683,7 @@ rt_read_slowunlock(struct rw_mutex *rwm, + { + struct rt_mutex *mutex = &rwm->mutex; + struct rt_mutex_waiter *waiter; ++ struct task_struct *pendowner; + struct reader_lock_struct *rls; + unsigned long flags; + unsigned int reader_count; +@@ -1791,6 +1792,7 @@ rt_read_slowunlock(struct rw_mutex *rwm, + rwm->owner = RT_RW_PENDING_READ; + } + ++ pendowner = waiter->task; + wakeup_next_waiter(mutex, savestate); + + /* +@@ -1806,6 +1808,17 @@ rt_read_slowunlock(struct rw_mutex *rwm, + if (rt_mutex_has_waiters(mutex)) { + waiter = rt_mutex_top_waiter(mutex); + rwm->prio = waiter->task->prio; ++ /* ++ * If readers still own this lock, then we need ++ * to update the pi_list too. Readers have a separate ++ * path in the PI chain. ++ */ ++ if (reader_count) { ++ spin_lock(&pendowner->pi_lock); ++ plist_del(&waiter->pi_list_entry, ++ &pendowner->pi_waiters); ++ spin_unlock(&pendowner->pi_lock); ++ } + } else + rwm->prio = MAX_PRIO; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/rwlock-slowunlock-mutex-fix.patch new/patches.rt/rwlock-slowunlock-mutex-fix.patch --- old/patches.rt/rwlock-slowunlock-mutex-fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/rwlock-slowunlock-mutex-fix.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,28 @@ +Subject: Linux-RT 2.6.25.8-RT7 +From: http://www.kernel.org/pub/linux/kernel/projects/rt/ +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> +--- + kernel/rtmutex.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +Index: linux-2.6.25.8-rt7/kernel/rtmutex.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rtmutex.c 2008-06-23 19:14:37.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rtmutex.c 2008-06-23 19:14:37.000000000 -0400 +@@ -1793,6 +1793,16 @@ rt_read_slowunlock(struct rw_mutex *rwm, + + wakeup_next_waiter(mutex, savestate); + ++ /* ++ * If we woke up a reader but the lock is already held by readers ++ * we need to set the mutex owner to RT_RW_READER, since the ++ * wakeup_next_waiter set it to the pending reader. ++ */ ++ if (reader_count) { ++ WARN_ON(waiter->write_lock); ++ rt_mutex_set_owner(mutex, RT_RW_READER, 0); ++ } ++ + if (rt_mutex_has_waiters(mutex)) { + waiter = rt_mutex_top_waiter(mutex); + rwm->prio = waiter->task->prio; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/rwlock-torture-no-rt.patch new/patches.rt/rwlock-torture-no-rt.patch --- old/patches.rt/rwlock-torture-no-rt.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rt/rwlock-torture-no-rt.patch 2008-06-24 06:12:40.000000000 +0200 @@ -0,0 +1,26 @@ +From: Steven Rostedt <srostedt(a)redhat.com> +Subject: rwlock: fix torture test to handle non-rt + + +Signed-off-by: Steven Rostedt <srostedt(a)redhat.com> + +Acked-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> + +--- + kernel/rwlock_torture.c | 2 ++ + 1 file changed, 2 insertions(+) + +Index: linux-2.6.25.8-rt7/kernel/rwlock_torture.c +=================================================================== +--- linux-2.6.25.8-rt7.orig/kernel/rwlock_torture.c 2008-06-23 19:14:35.000000000 -0400 ++++ linux-2.6.25.8-rt7/kernel/rwlock_torture.c 2008-06-23 19:14:39.000000000 -0400 +@@ -570,7 +570,9 @@ static int run_test(unsigned long time) + run_two_locks(time, read); + } + ++#ifdef CONFIG_PREEMPT_RT + WARN_ON_ONCE(current->reader_lock_count); ++#endif + + return ret; + } ++++++ patches.xen.tar.bz2 ++++++ ++++ 7651 lines of diff (skipped) ++++++ series.conf ++++++ --- kernel-source/series.conf 2008-06-23 07:34:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2008-06-28 10:02:55.000000000 +0200 @@ -34,6 +34,8 @@ patches.kernel.org/patch-2.6.25.4-5 patches.kernel.org/patch-2.6.25.5-6 patches.kernel.org/patch-2.6.25.6-7 + patches.kernel.org/patch-2.6.25.7-8 + patches.kernel.org/patch-2.6.25.8-9 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -199,6 +201,10 @@ patches.arch/acpi_thinkpad_introduce_acpica_rsdt_global_variable.patch patches.arch/acpi_thinkpad_remove_R40e_c-state_blacklist.patch + patches.arch/acpi_introduce_osi_spec_conform.patch + + patches.arch/acpi_thermal_passive_blacklist.patch + patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch patches.fixes/acpi-bay-cleanup-and-exit.patch @@ -426,6 +432,7 @@ patches.drivers/libata-ahci-jmb361-one-port patches.drivers/libata-update-atapi_check_dma patches.drivers/libata-implement-atapi-nopio + patches.drivers/libata-ahci-clear-irq_stat patches.drivers/cdrom-dont-check-PLAY_AUDIO-in-count_tracks # patches.fixes/mptbase-vmware-fix @@ -455,6 +462,7 @@ ######################################################## # PCI and PCI hotplug ######################################################## + patches.drivers/pci-vt3336-no-msi ######################################################## # sysfs / driver core @@ -508,6 +516,8 @@ patches.drivers/alsa-emu10k1-audigy2-digital-fix patches.drivers/alsa-hp2133-mic-fix patches.drivers/alsa-asus-a9t-fix + # post 11.0-GM + patches.drivers/alsa-fix-hda-alc262-sonyassamd-array ######################################################## # Other driver fixes @@ -518,7 +528,6 @@ +49840 patches.fixes/serial8250_console_write-ier +49840 patches.fixes/fix-serial-8250-UART_BUG_TXEN-test patches.fixes/bluetooth-wake-up-properly-after-ide-timeout-expires.patch - patches.fixes/fix-tty-speed-handling-on-8250.patch # suse-2.4 compatible crypto loop driver patches.suse/twofish-2.6 @@ -1587,6 +1596,23 @@ +RT patches.rt/sched-cpupri-priocount.patch +RT patches.rt/ftrace-hotplug-fix.patch + # still needs Signed-off-by: + #sched-global-rt-runtime.patch + ++RT patches.rt/rwlock-pi-lock-reader.patch + ++RT patches.rt/fix-adaptive-hack.patch ++RT patches.rt/rwlock-slowunlock-mutex-fix.patch ++RT patches.rt/rwlock-slowunlock-mutex-fix2.patch ++RT patches.rt/rt-mutex-use-inline.patch ++RT patches.rt/rt-mutex-namespace.patch ++RT patches.rt/rtmutex-debug-fix.patch ++RT patches.rt/rwlock-protect-reader_lock_count.patch ++RT patches.rt/ftrace-stop-trace-on-crash.patch + ++RT patches.rt/futex-fix-fault-damage.patch ++RT patches.rt/rwlock-torture-no-rt.patch + # LSG Enhancements to RT locking (not upstream) - patches.rt/rtmutex-lateral-steal-sysctl.patch - patches.rt/rtmutex-adaptive-locks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package rpmlint checked in at Mon Jun 30 11:32:26 CEST 2008. -------- --- rpmlint/rpmlint.changes 2008-06-28 01:29:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpmlint/rpmlint.changes 2008-06-29 15:54:36.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jun 29 15:54:17 CEST 2008 - schwab(a)suse.de + +- No PT_GNU_STACK on ia64 and ppc64. + +------------------------------------------------------------------- New: ---- pt-gnu-stack.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.EX5653/_old 2008-06-30 11:32:19.000000000 +0200 +++ /var/tmp/diff_new_pack.EX5653/_new 2008-06-30 11:32:19.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: rpm-python Summary: Rpm correctness checker Version: 0.83 -Release: 3 +Release: 5 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in @@ -90,6 +90,7 @@ Patch61: fix-tabs-indenting.diff Patch62: no-badness-return.diff Patch63: suse-factory-config.diff +Patch64: pt-gnu-stack.diff %py_requires %description @@ -156,6 +157,7 @@ %patch61 %patch62 %patch63 +%patch64 cp -p %{SOURCE1} . cp -p %{SOURCE2} . cp -p %{SOURCE3} . @@ -194,6 +196,8 @@ /usr/share/man/man1/rpmlint.1.gz %changelog +* Sun Jun 29 2008 schwab(a)suse.de +- No PT_GNU_STACK on ia64 and ppc64. * Sat Jun 28 2008 dmueller(a)suse.de - also read /etc/rpmlint/factory.config * Fri Jun 27 2008 dmueller(a)suse.de ++++++ pt-gnu-stack.diff ++++++ --- BinariesCheck.py +++ BinariesCheck.py @@ -341,7 +341,7 @@ class BinariesCheck(AbstractCheck.Abstra if bin_info.stack: if bin_info.exec_stack: printWarning(pkg, 'executable-stack', i[0]) - else: + elif pkg.arch != 'ia64' and pkg.arch != 'ppc64': printError(pkg, 'missing-PT_GNU_STACK-section', i[0]) else: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint-Factory
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package rpmlint-Factory checked in at Mon Jun 30 11:32:09 CEST 2008. -------- --- rpmlint-Factory/rpmlint-Factory.changes 2008-06-28 01:30:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpmlint-Factory/rpmlint-Factory.changes 2008-06-28 12:48:36.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 28 12:47:30 CEST 2008 - dmueller(a)suse.de + +- remove badness for defattr again - check is unrepairable broken + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-Factory.spec ++++++ --- /var/tmp/diff_new_pack.QN4828/_old 2008-06-30 11:31:57.000000000 +0200 +++ /var/tmp/diff_new_pack.QN4828/_new 2008-06-30 11:31:57.000000000 +0200 @@ -15,7 +15,7 @@ Requires: rpmlint-mini Summary: Rpm correctness checker - Factory configuration Version: 1.0 -Release: 16 +Release: 18 Url: http://rpmlint.zarb.org/ License: GPL v2 or later Group: System/Packages @@ -53,6 +53,8 @@ %changelog * Sat Jun 28 2008 dmueller(a)suse.de +- remove badness for defattr again - check is unrepairable broken +* Sat Jun 28 2008 dmueller(a)suse.de - install as /etc/rpmlint/factory.config to resolve bootstrapping issue * Mon Jun 23 2008 dmueller(a)suse.de ++++++ config ++++++ --- rpmlint-Factory/config 2008-06-23 00:32:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpmlint-Factory/config 2008-06-28 12:47:26.000000000 +0200 @@ -50,7 +50,7 @@ setBadness('executable-docs', 900) #fatal checks -setBadness('files-attr-not-set', 10000) +#setBadness('files-attr-not-set', 10000) setBadness('percent-in-dependency', 10000) setBadness('percent-in-obsoletes', 10000) setBadness('percent-in-provides', 10000) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-desktop
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package gnome-desktop checked in at Mon Jun 30 11:31:45 CEST 2008. -------- --- GNOME/gnome-desktop/gnome-desktop.changes 2008-06-16 20:21:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-desktop/gnome-desktop.changes 2008-06-20 18:59:53.988896000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 20 19:06:36 CEST 2008 - maw(a)suse.de + +- Update to version 2.23.4: + + Require intltool 0.40.0 + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-desktop-2.23.3.tar.bz2 New: ---- gnome-desktop-2.23.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop.spec ++++++ --- /var/tmp/diff_new_pack.Uc2812/_old 2008-06-30 11:31:31.000000000 +0200 +++ /var/tmp/diff_new_pack.Uc2812/_new 2008-06-30 11:31:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-desktop (Version 2.23.3) +# spec file for package gnome-desktop (Version 2.23.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Obsoletes: gnome-core -Version: 2.23.3 +Version: 2.23.4 Release: 1 Summary: The GNOME Desktop API Library Source: %{name}-%{version}.tar.bz2 @@ -182,6 +182,10 @@ %{_datadir}/gtk-doc/html/gnome-desktop %changelog +* Fri Jun 20 2008 maw(a)suse.de +- Update to version 2.23.4: + + Require intltool 0.40.0 + + Updated translations. * Mon Jun 16 2008 maw(a)suse.de - Update to version 2.23.3: + libgnome-desktop: ++++++ gnome-desktop-2.23.3.tar.bz2 -> gnome-desktop-2.23.4.tar.bz2 ++++++ ++++ 4494 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
78
Older →

Jump to page: