commit kernel-source

Hello community, here is the log from the commit of package kernel-source checked in at Mon Oct 2 11:44:48 CEST 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-09-28 01:32:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2006-10-01 22:15:36.000000000 +0200 @@ -1,0 +2,19 @@ +Sun Oct 1 20:30:17 CEST 2006 - pavel@suse.cz + +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. + +------------------------------------------------------------------- +Thu Sep 28 20:38:10 CEST 2006 - agruen@suse.de + +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. + +------------------------------------------------------------------- +Thu Sep 28 17:16:16 CEST 2006 - olh@suse.de + +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 7 +Release: 8 Summary: Kernel with PAE Support License: GPL Group: System/Kernel @@ -119,7 +119,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -356,7 +356,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-bigsmp.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-bigsmp.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -392,37 +392,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-bigsmp ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-bigsmp ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-bigsmp \ + %my_builddir/kabi/$SUBARCH/symvers-bigsmp \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-bigsmp -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-bigsmp.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -475,6 +462,16 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 7 +Release: 8 Summary: A Debug Version of the Kernel License: GPL Group: System/Kernel @@ -124,7 +124,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -361,7 +361,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-debug.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-debug.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -397,37 +397,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-debug ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-debug ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-debug \ + %my_builddir/kabi/$SUBARCH/symvers-debug \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-debug -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-debug.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -480,6 +467,16 @@ %files -f kernel.files %changelog -n kernel-debug +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 7 +Release: 8 Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems License: GPL Group: System/Kernel @@ -145,7 +145,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -382,7 +382,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-default.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-default.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -418,37 +418,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-default ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-default ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-default \ + %my_builddir/kabi/$SUBARCH/symvers-default \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-default -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-default.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -501,6 +488,16 @@ %files -f kernel.files %changelog -n kernel-default +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -17,7 +17,7 @@ Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel Version: 2.6.18 -Release: 5 +Release: 6 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -27,7 +27,7 @@ -------- Andreas Gruenbacher <agruen@suse.de> -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %install @@ -40,6 +40,16 @@ /etc/dummy %changelog -n kernel-dummy +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 6 +Release: 7 Summary: 64-Bit Kernel for iSeries License: GPL Group: System/Kernel @@ -120,7 +120,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -357,7 +357,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-iseries64.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-iseries64.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -393,37 +393,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-iseries64 ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-iseries64 ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-iseries64 \ + %my_builddir/kabi/$SUBARCH/symvers-iseries64 \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-iseries64 -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-iseries64.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -476,6 +463,16 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 7 +Release: 8 Summary: kernel for kdump License: GPL Group: System/Kernel @@ -129,7 +129,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -366,7 +366,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-kdump.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-kdump.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -402,37 +402,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-kdump ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-kdump ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-kdump \ + %my_builddir/kabi/$SUBARCH/symvers-kdump \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-kdump -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-kdump.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -485,6 +472,16 @@ %files -f kernel.files %changelog -n kernel-kdump +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 6 +Release: 7 Summary: Kernel for ppc64 Systems License: GPL, LGPL Group: System/Kernel @@ -134,7 +134,7 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -371,7 +371,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-ppc64.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-ppc64.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -407,37 +407,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-ppc64 ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-ppc64 ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-ppc64 \ + %my_builddir/kabi/$SUBARCH/symvers-ppc64 \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-ppc64 -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-ppc64.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -490,6 +477,16 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 5 +Release: 6 Summary: The Standard Kernel License: GPL Group: System/Kernel @@ -117,7 +117,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -354,7 +354,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-s390.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-s390.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -390,37 +390,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-s390 ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-s390 ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-s390 \ + %my_builddir/kabi/$SUBARCH/symvers-s390 \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-s390 -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-s390.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -473,6 +460,16 @@ %files -f kernel.files %changelog -n kernel-s390 +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -26,7 +26,7 @@ %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status Version: 2.6.18 -Release: 7 +Release: 8 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -94,7 +94,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -276,6 +276,16 @@ %files -f kernel-source.files %changelog -n kernel-source +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -49,7 +49,7 @@ Summary: Kernel Symbol Versions (modversions) Group: Development/Sources Version: 2.6.18 -Release: 7 +Release: 8 Requires: linux Requires: kernel-source = 2.6.18-%release Source11: arch-symbols @@ -84,7 +84,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %install @@ -127,6 +127,16 @@ /boot/symsets-*-*.tar.gz %changelog -n kernel-syms +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 7 +Release: 8 Summary: The User Mode Linux kernel. License: GPL Group: System/Kernel @@ -125,7 +125,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -362,7 +362,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-um.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-um.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -398,37 +398,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-um ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-um ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-um \ + %my_builddir/kabi/$SUBARCH/symvers-um \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-um -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-um.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -481,6 +468,16 @@ %files -f kernel.files %changelog -n kernel-um +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:24.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:24.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 3 +Release: 4 Summary: The Standard Kernel - without any SUSE patches License: GPL Group: System/Kernel @@ -137,7 +137,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -374,7 +374,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-vanilla.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-vanilla.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -410,37 +410,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-vanilla ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-vanilla ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-vanilla \ + %my_builddir/kabi/$SUBARCH/symvers-vanilla \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-vanilla -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-vanilla.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -493,6 +480,16 @@ %files -f kernel.files %changelog -n kernel-vanilla +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:25.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:25.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 5 +Release: 6 Summary: The Xen Kernel License: GPL Group: System/Kernel @@ -123,7 +123,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -360,7 +360,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-xen.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-xen.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -396,37 +396,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-xen ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-xen ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-xen \ + %my_builddir/kabi/$SUBARCH/symvers-xen \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-xen -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-xen.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -479,6 +466,16 @@ %files -f kernel.files %changelog -n kernel-xen +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ kernel-xenpae.spec ++++++ --- /var/tmp/diff_new_pack.5K2Abv/_old 2006-10-02 11:42:25.000000000 +0200 +++ /var/tmp/diff_new_pack.5K2Abv/_new 2006-10-02 11:42:25.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: python %endif Version: 2.6.18 -Release: 5 +Release: 6 Summary: The Xen Kernel with PAE support License: GPL Group: System/Kernel @@ -120,7 +120,7 @@ -Source Timestamp: 2006/09/27 23:10:02 UTC +Source Timestamp: 2006/10/01 18:40:35 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -357,7 +357,7 @@ # 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=%_sourcedir/symsets-$SUBARCH-xenpae.tar.gz +old_symsets=%my_builddir/kabi/$SUBARCH/symsets-xenpae.tar.gz [ -e $old_symsets ] || old_symsets= ( grep -v $'\tvmlinux$' Module.symvers # Find out in which built-in.o files the exported symbols that ended @@ -393,37 +393,24 @@ %endif # Check for kABI changes KABI=0 -if [ -e %my_builddir/kabi/$ARCH/symvers-xenpae ]; then +if [ -e %my_builddir/kabi/$SUBARCH/symvers-xenpae ]; then %_sourcedir/kabi-checks \ - %my_builddir/kabi/$ARCH/symvers-xenpae \ + %my_builddir/kabi/$SUBARCH/symvers-xenpae \ Module.symvers \ %my_builddir/kabi/commonsyms \ %my_builddir/kabi/usedsyms \ || KABI=$? fi if [ $KABI -gt %tolerate_kabi_changes ]; then - source /.buildenv - if [ -z "$BUILD_MBUILD" ]; then - # Abort Autobuild builds with too many ABI changes (but don't abort - # mbuild builds because of that). + echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ + "of %tolerate_kabi_changes. Please try to avoid the kABI changes." + if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-xenpae -a \ + ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then + echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ + "directory to build this kernel even though its badness is" \ + "higher than allowed for an official kernel." exit 1 fi - # Create an unresolved dummy shared library symbol: this way we can keep - # the kernel rpm but installing the package will fail without --nodeps, - # and the Autobuild team will detect packages with excessive badness as - # well. - gcc -o dummy.o -shared -Wl,-soname,kabi_badness_$KABI - gcc -o %buildroot/boot/kabi-badness-$KABI -nostdlib -shared dummy.o - rm dummy.o - echo " -kABI changes of badness $KABI exceed the maximum allowed badness -of %tolerate_kabi_changes. The kernel package created will have -an unresolved \`kabi_badness_$KABI' requirement. -Please try to avoid the kABI changes. If this is not feasible, -get permission to bump the kABI and check in new reference files. -If this is not an official kernel build, you may want to change -the value of %%tolerate_kabi_changes in rpm/kernel-xenpae.spec. -" # Indicate the ABI badness in build result emails. echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag fi @@ -476,6 +463,16 @@ %files -f kernel.files %changelog -n kernel-xenpae +* Sun Oct 01 2006 - pavel@suse.cz +- patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch: + add support for platform mode. +* Thu Sep 28 2006 - agruen@suse.de +- patches.suse/{parser-match_string.diff,nfs4acl-ext3.diff}: + Add NFSv4 ACLs on ext3 (FATE301275, experimental). +- Update the config files. +* Thu Sep 28 2006 - olh@suse.de +- update patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch + disable also 8520_pci to fix crash with multiport IO cards * Thu Sep 28 2006 - gregkh@suse.de - patches.suse/usb-storage-disable-delay.patch: USB: change default delay time for usb-storage devices. ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2006-09-28 01:32:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2006-10-01 22:15:32.000000000 +0200 @@ -1 +1 @@ -2006/09/27 23:10:02 UTC +2006/10/01 18:40:35 UTC ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/default new/config/alpha/default --- old/config/alpha/default 2006-09-21 19:10:15.000000000 +0200 +++ new/config/alpha/default 2006-09-29 15:05:16.000000000 +0200 @@ -2921,6 +2921,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2937,6 +2938,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/bigsmp new/config/i386/bigsmp --- old/config/i386/bigsmp 2006-09-21 19:10:15.000000000 +0200 +++ new/config/i386/bigsmp 2006-09-29 15:05:16.000000000 +0200 @@ -3257,6 +3257,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -3273,6 +3274,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2006-09-21 19:10:15.000000000 +0200 +++ new/config/i386/debug 2006-09-29 15:05:16.000000000 +0200 @@ -3251,6 +3251,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -3267,6 +3268,7 @@ CONFIG_JFS_DEBUG=y CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default --- old/config/i386/default 2006-09-21 19:10:15.000000000 +0200 +++ new/config/i386/default 2006-09-29 15:05:16.000000000 +0200 @@ -3252,6 +3252,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -3268,6 +3269,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/kdump new/config/i386/kdump --- old/config/i386/kdump 2006-09-21 19:10:15.000000000 +0200 +++ new/config/i386/kdump 2006-09-29 15:05:16.000000000 +0200 @@ -3283,6 +3283,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -3299,6 +3300,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/um new/config/i386/um --- old/config/i386/um 2006-09-20 20:45:12.000000000 +0200 +++ new/config/i386/um 2006-09-29 15:05:16.000000000 +0200 @@ -802,6 +802,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set @@ -818,6 +819,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2006-09-21 19:10:15.000000000 +0200 +++ new/config/i386/xen 2006-09-29 15:05:16.000000000 +0200 @@ -2969,6 +2969,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2985,6 +2986,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y @@ -3314,8 +3316,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_CONSOLE=y -CONFIG_XEN_FRAMEBUFFER=m -CONFIG_XEN_KEYBOARD=m CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_DISABLE_SERIAL=y CONFIG_XEN_SYSFS=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae --- old/config/i386/xenpae 2006-09-21 19:10:15.000000000 +0200 +++ new/config/i386/xenpae 2006-09-29 15:05:16.000000000 +0200 @@ -2971,6 +2971,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2987,6 +2988,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y @@ -3316,8 +3318,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_CONSOLE=y -CONFIG_XEN_FRAMEBUFFER=m -CONFIG_XEN_KEYBOARD=m CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_DISABLE_SERIAL=y CONFIG_XEN_SYSFS=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2006-09-21 19:10:16.000000000 +0200 +++ new/config/ia64/debug 2006-09-29 15:05:16.000000000 +0200 @@ -2707,6 +2707,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2719,6 +2720,7 @@ CONFIG_REISERFS_FS_SECURITY=y # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2006-09-21 19:10:16.000000000 +0200 +++ new/config/ia64/default 2006-09-29 15:05:16.000000000 +0200 @@ -2706,6 +2706,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2718,6 +2719,7 @@ CONFIG_REISERFS_FS_SECURITY=y # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default --- old/config/powerpc/default 2006-09-21 19:10:16.000000000 +0200 +++ new/config/powerpc/default 2006-09-29 15:05:16.000000000 +0200 @@ -2131,6 +2131,7 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=y CONFIG_JBD_DEBUG=y @@ -2147,6 +2148,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/iseries64 new/config/powerpc/iseries64 --- old/config/powerpc/iseries64 2006-09-21 19:10:16.000000000 +0200 +++ new/config/powerpc/iseries64 2006-09-29 15:05:16.000000000 +0200 @@ -1055,6 +1055,7 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set @@ -1071,6 +1072,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump --- old/config/powerpc/kdump 2006-09-21 19:10:16.000000000 +0200 +++ new/config/powerpc/kdump 2006-09-29 15:05:16.000000000 +0200 @@ -1624,6 +1624,7 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set @@ -1640,6 +1641,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64 --- old/config/powerpc/ppc64 2006-09-21 19:10:16.000000000 +0200 +++ new/config/powerpc/ppc64 2006-09-29 15:05:16.000000000 +0200 @@ -1911,6 +1911,7 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set @@ -1927,6 +1928,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default --- old/config/s390/default 2006-09-20 20:45:13.000000000 +0200 +++ new/config/s390/default 2006-09-29 15:05:16.000000000 +0200 @@ -742,6 +742,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -758,6 +759,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2006-09-20 20:45:13.000000000 +0200 +++ new/config/s390/s390 2006-09-29 15:05:16.000000000 +0200 @@ -737,6 +737,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -753,6 +754,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2006-09-21 19:10:16.000000000 +0200 +++ new/config/x86_64/debug 2006-09-29 15:05:16.000000000 +0200 @@ -2876,6 +2876,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2892,6 +2893,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2006-09-21 19:10:16.000000000 +0200 +++ new/config/x86_64/default 2006-09-29 15:05:16.000000000 +0200 @@ -2876,6 +2876,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2892,6 +2893,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/kdump new/config/x86_64/kdump --- old/config/x86_64/kdump 2006-09-21 19:10:16.000000000 +0200 +++ new/config/x86_64/kdump 2006-09-29 15:05:16.000000000 +0200 @@ -2889,6 +2889,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2905,6 +2906,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/um new/config/x86_64/um --- old/config/x86_64/um 2006-09-20 20:45:13.000000000 +0200 +++ new/config/x86_64/um 2006-09-29 15:05:16.000000000 +0200 @@ -764,6 +764,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set @@ -780,6 +781,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2006-09-21 19:10:16.000000000 +0200 +++ new/config/x86_64/xen 2006-09-29 15:05:16.000000000 +0200 @@ -2804,6 +2804,7 @@ CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_NFS4ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m CONFIG_JBD_DEBUG=y @@ -2820,6 +2821,7 @@ # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FS_NFS4ACL=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_SECURITY=y @@ -3140,8 +3142,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_CONSOLE=y -CONFIG_XEN_FRAMEBUFFER=m -CONFIG_XEN_KEYBOARD=m CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_DISABLE_SERIAL=y CONFIG_XEN_SYSFS=y ++++++ kabi.tar.bz2 ++++++ ++++ 87323 lines of diff (skipped) ++++++ make-symsets ++++++ --- kernel-source/make-symsets 2006-09-28 01:32:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/make-symsets 2006-10-01 22:15:38.000000000 +0200 @@ -47,21 +47,23 @@ #echo "Provides: kernel($class) = $1" done +shopt -s nullglob + if [ -n "$old_tarball" ]; then # Reuse all sets of symbols from the old tarball that are # still the same. - basename=$(basename $old_tarball .tar.gz) + old_basename=$(basename $old_tarball .tar.gz) - olddir=$tmpdir/old/$basename mkdir -p $tmpdir/old zcat $old_tarball \ | tar xf - -C $tmpdir/old + set -- $tmpdir/old/* + olddir=$1 if [ ! -d $olddir ]; then - echo "$old_tarball does not contain directory $basename" + echo "$old_tarball does not contain directory $old_basename" exit 1 fi - shopt -s nullglob for oldset in $olddir/* ; do [ -e $newdir/${oldset#$olddir/} ] && continue class=${oldset##*/} ; class=${class%.*} @@ -71,7 +73,9 @@ # '*' doesn't occur in either file. if [ -z "$(join -t '*' -j 1 -v 1 "$oldset" "$newset")" ]; then keep_oldset[${#keep_oldset[@]}]=$oldset - #echo "Provides: kernel($class) = ${oldset##*.}" + #echo "Provides: kernel($class) = ${oldset##*.} (old)" + else + echo "No longer provided: kernel($class) = ${oldset##*.}" >&2 fi done ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-kdump-xmon-stop-cpu.patch new/patches.arch/ppc-kdump-xmon-stop-cpu.patch --- old/patches.arch/ppc-kdump-xmon-stop-cpu.patch 2006-09-20 20:45:14.000000000 +0200 +++ new/patches.arch/ppc-kdump-xmon-stop-cpu.patch 2006-10-01 19:49:29.000000000 +0200 @@ -2,7 +2,7 @@ From: David Wilder <dwilder@us.ibm.com> Date: Mon, 10 Apr 2006 15:32:21 -0700 Message-ID: <443ADCF5.60702@us.ibm.com> -Patch-mainline: 2.6.19 ? +Patch-mainline: 2.6.19 Bug 149545 - LTC21344-kdump boot panic when a CPU hangs in the first kernel Bug 149557 - LTC21346-kdump panicks during the system hang when the xmon is enabled diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-reiserfs-cc-optimize.patch new/patches.arch/ppc-reiserfs-cc-optimize.patch --- old/patches.arch/ppc-reiserfs-cc-optimize.patch 2006-08-30 21:42:19.000000000 +0200 +++ new/patches.arch/ppc-reiserfs-cc-optimize.patch 2006-10-01 19:49:29.000000000 +0200 @@ -1,5 +1,6 @@ Subject: only compile with -O1 if the compiler is broken From: Olaf Hering <olh@suse.de> +Patch-mainline: 2.6.19 Only compile with -O1 if the (very old) compiler is broken. We use reiserfs alot since SLES9 on ppc64, and it was never seen with gcc33. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-tumbler-active_state.patch new/patches.arch/ppc-tumbler-active_state.patch --- old/patches.arch/ppc-tumbler-active_state.patch 2006-09-20 20:45:14.000000000 +0200 +++ new/patches.arch/ppc-tumbler-active_state.patch 2006-10-01 19:49:29.000000000 +0200 @@ -1,5 +1,6 @@ -Subject: [PPC,SOUND] Fix audio gpio state detection -From: Andreas Schwab <schwab@suse.de> +Subject: [PPC,SOUND] Fix audio gpio state detection +From: Andreas Schwab <schwab@suse.de> +Patch-mainline: 2.6.19 When booting with line out or headphone plugged, you won't hear anything. The problem is that after reset all channels are muted, but the actual @@ -7,7 +8,7 @@ expected by check_audio_gpio. For example, the line_mute port is set to 7, but check_audio_gpio would expect 0xd or 0xf, thus its return value indicates that it is not active, even though it is. AFAICS only looking -at the low bit is enough to determine whether the port is active. +at the low bit is enough to determine whether the port is active. Signed-off-by: Andreas Schwab <schwab@suse.de> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc64-xmon-autobacktrace.patch new/patches.arch/ppc64-xmon-autobacktrace.patch --- old/patches.arch/ppc64-xmon-autobacktrace.patch 2006-09-20 20:45:14.000000000 +0200 +++ new/patches.arch/ppc64-xmon-autobacktrace.patch 2006-10-01 19:49:29.000000000 +0200 @@ -1,7 +1,8 @@ -Subject: [PATCH] allow xmon=bt to print a backtrace by default -From: Olaf Hering <olh@suse.de> +Subject: [PATCH] allow xmon=bt to print a backtrace by default +From: Olaf Hering <olh@suse.de> +Patch-mainline: 2.6.19 -xmon does not print a backtrace per default. This is bad on systems with +xmon does not print a backtrace per default. This is bad on systems with USB keyboard, the most needed info about the crash is lost. print a backtrace during the very first xmon entry. ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/ixgb-eeh.patch new/patches.drivers/ixgb-eeh.patch --- old/patches.drivers/ixgb-eeh.patch 2006-09-20 20:45:14.000000000 +0200 +++ new/patches.drivers/ixgb-eeh.patch 2006-10-01 19:49:29.000000000 +0200 @@ -1,6 +1,7 @@ Subject: [PATCH] ixgb: add PCI Error recovery callbacks From: Linas Vepstas <linas@austin.ibm.com> References: 190555 - LTC25058 +Patch-mainline: 2.6.19 Adds PCI Error recovery callbacks to the Intel 10-gigabit ethernet ixgb device driver. Lightly tested, works. ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ignore-aix-disk-label.patch new/patches.fixes/ignore-aix-disk-label.patch --- old/patches.fixes/ignore-aix-disk-label.patch 2006-09-20 20:45:14.000000000 +0200 +++ new/patches.fixes/ignore-aix-disk-label.patch 2006-10-01 19:49:29.000000000 +0200 @@ -1,7 +1,7 @@ Subject: ignore partition table on disks with AIX label From: olh@suse.de References: 175995 -Patch-mainline: 2.6.19 ? +Patch-mainline: 2.6.19 The on-disk data structures from AIX are not known, also the filesystem layout is not known. There is a msdos partition signature at the end of diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ipmi-unload-crash new/patches.fixes/ipmi-unload-crash --- old/patches.fixes/ipmi-unload-crash 2006-09-20 20:45:14.000000000 +0200 +++ new/patches.fixes/ipmi-unload-crash 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -From: Olaf Kirch <okir@suse.de> -Subject: Avoid Oops on IPMI module unload -References: 185470 - - drivers/char/ipmi/ipmi_msghandler.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) - ---- linux-2.6.18.orig/drivers/char/ipmi/ipmi_msghandler.c -+++ linux-2.6.18/drivers/char/ipmi/ipmi_msghandler.c -@@ -3426,7 +3426,7 @@ struct ipmi_recv_msg *ipmi_alloc_recv_ms - { - struct ipmi_recv_msg *rv; - -- rv = kmalloc(sizeof(struct ipmi_recv_msg), GFP_ATOMIC); -+ rv = kzalloc(sizeof(struct ipmi_recv_msg), GFP_ATOMIC); - if (rv) { - rv->user = NULL; - rv->done = free_recv_msg; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nf_bridge-header-size new/patches.fixes/nf_bridge-header-size --- old/patches.fixes/nf_bridge-header-size 2006-08-28 20:03:30.000000000 +0200 +++ new/patches.fixes/nf_bridge-header-size 2006-10-01 19:49:29.000000000 +0200 @@ -1,6 +1,7 @@ Subject: nf_bridge: ethernet header is 14 not 16 bytes From: jbeulich@novell.com Acked-by: kraxel@suse.de +Patch-mainline: yes References: 150410 The bridge netfilter code saves two more bytes that it should. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ppc-ide-interrupt.patch new/patches.fixes/ppc-ide-interrupt.patch --- old/patches.fixes/ppc-ide-interrupt.patch 2006-09-21 15:49:36.000000000 +0200 +++ new/patches.fixes/ppc-ide-interrupt.patch 2006-10-01 19:49:29.000000000 +0200 @@ -1,12 +1,13 @@ -Subject: Re: IDE not found on Performa due to interrupt breakage -From: Benjamin Herrenschmidt <benh@kernel.crashing.org> +Subject: Re: IDE not found on Performa due to interrupt breakage +From: Benjamin Herrenschmidt <benh@kernel.crashing.org> +Patch-mainline: 2.6.19 On Thu, 2006-09-21 at 13:50 +0200, Olaf Hering wrote: -> The IDE controller is not usable on a Performa 6400 with 2.6.18: -> -> <6>hda: Enabling MultiWord DMA 2 -> <4>ide0: Disabled unable to get IRQ 13. -> <6>ide0: failed to initialize IDE interface +> The IDE controller is not usable on a Performa 6400 with 2.6.18: +> +> <6>hda: Enabling MultiWord DMA 2 +> <4>ide0: Disabled unable to get IRQ 13. +> <6>ide0: failed to initialize IDE interface .../... diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sd-fix-unknown-size new/patches.fixes/sd-fix-unknown-size --- old/patches.fixes/sd-fix-unknown-size 2006-09-20 20:45:14.000000000 +0200 +++ new/patches.fixes/sd-fix-unknown-size 2006-10-01 19:49:29.000000000 +0200 @@ -1,7 +1,7 @@ From: Mike Anderson <andmike@us.ibm.com> Subject: Wrong size information for device with disabled read access References: #176780 - LTC23895 -Patch-Mainline: no +Patch-Mainline: 2.6.19 When accessing a device with disabled read access the capacity is set randomly to 1GB. This makes it impossible to userspace tools to detect ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/offsets_h-dirname.patch new/patches.rpmify/offsets_h-dirname.patch --- old/patches.rpmify/offsets_h-dirname.patch 2006-03-06 20:13:27.000000000 +0100 +++ new/patches.rpmify/offsets_h-dirname.patch 2006-10-01 19:49:29.000000000 +0200 @@ -1,5 +1,6 @@ Subject: remove absolte patch from comment From: olh@suse.de +Patch-mainline: 2.6.19 autobuild doesnt like the $RPM_BUILD_ROOT string being there ++++++ patches.suse.tar.bz2 ++++++ ++++ 2711 lines of diff (skipped) ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen-vfb-dom0 new/patches.xen/xen-vfb-dom0 --- old/patches.xen/xen-vfb-dom0 2006-09-20 20:45:18.000000000 +0200 +++ new/patches.xen/xen-vfb-dom0 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -From: ccoffing@novell.com -Subject: Suppress Xen virtual framebuffer and keyboard setup in dom0 -Patch-mainline: obsolete - ---- - drivers/xen/xenfb/xenfb.c | 3 +++ - drivers/xen/xenkbd/xenkbd.c | 3 +++ - 2 files changed, 6 insertions(+) - ---- linux-2.6.18.orig/drivers/xen/xenfb/xenfb.c -+++ linux-2.6.18/drivers/xen/xenfb/xenfb.c -@@ -370,6 +370,9 @@ static int __init xenfb_probe(void) - struct evtchn_alloc_unbound alloc_unbound; - struct xenbus_transaction xbt; - -+ if (is_initial_xendomain()) -+ return -ENODEV; -+ - info = kmalloc(sizeof(*info), GFP_KERNEL); - if (info == NULL) - return -ENOMEM; ---- linux-2.6.18.orig/drivers/xen/xenkbd/xenkbd.c -+++ linux-2.6.18/drivers/xen/xenkbd/xenkbd.c -@@ -81,6 +81,9 @@ int __init xenkbd_init(void) - struct evtchn_alloc_unbound alloc_unbound; - struct xenbus_transaction xbt; - -+ if (is_initial_xendomain()) -+ return -ENODEV; -+ - dev = kmalloc(sizeof(*dev), GFP_KERNEL); - input_dev = input_allocate_device(); - if (!dev || !input_dev) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen-vfb-frontend new/patches.xen/xen-vfb-frontend --- old/patches.xen/xen-vfb-frontend 2006-09-21 19:10:17.000000000 +0200 +++ new/patches.xen/xen-vfb-frontend 1970-01-01 01:00:00.000000000 +0100 @@ -1,1140 +0,0 @@ -From: Markus Armbruster <armbru@redhat.com> -To: Christian.Limpach@cl.cam.ac.uk -Date: Monday, July 10, 2006 12:30 PM -Subject: Re: [Xen-devel] [PATCH 1/2] Virtual frame buffer: frontend -Patch-mainline: obsolete -Acked-by: ccoffing@novell.com, jbeulich@novell.com - -"Christian Limpach" <christian.limpach@gmail.com> writes: - -> On 6/26/06, Markus Armbruster <armbru@redhat.com> wrote: ->> Derived from ->> http://www.cs.utexas.edu/users/aliguori/vfb-20060124.bundle ->> ->> Converted to Xenstore and ported to current kernels. -> -> This looks good. -> -> Could you address the following issues: -> -> - the patch which defined struct xenfb_page seems to be missing - -This time it's included. - -> - handling of the ring indexes: -> + we generally prefer to store ring indexes in their unmasked form, -> it makes debugging easier and it allows the ring to be used to its -> full capacity instead of requiring leaving one slot empty to be able -> distinguish empty/full - -Done. - -> + unless I misread the code, the producer (for frontend to backend -> messages) seems to write to out_prod + 1 > out_cons, then increment -> out_prob (xenfb_do_update) and then the consumer processes entries -> from out_cons upto but not include the updated out_prod -> (xenfb_on_fb_event) -- the producer for the other way around (backend -> to frontend, xenfb_fb_event) seems to be correcter. - -The old code confused me. I guess my ring index change takes care of -this one, too. - -> + the lack of barriers -- /* FIXME barriers */ doesn't really cut it ;-) -> ==> I would suggest looking at the block or net frontend/backend -> drivers and copy/pasting some code from there... - -Found only read barriers in block fe/be. console has read and write -barriers. Now I'm confused. I added read barriers and documented my -confusion. - -> - xenbus transactions can fail and there's no code to retry failed transactions - -Done. - -> Additionally, I think that the dirty region protocol doesn't really -> perform too well in quite simple usage cases like having video play in -> one corner of the screen and the mouse being moved in the opposite -> corner. It's probably good enough for this version and supporting -> this protocol in the future isn't too bad. - -Saved for later. - -> I'm looking forward to seeing a new version of this patch, thanks! -> -> christian - -Here you go :) - -Index: head-2006-09-21/arch/i386/kernel/setup-xen.c -=================================================================== ---- head-2006-09-21.orig/arch/i386/kernel/setup-xen.c 2006-09-21 10:48:38.000000000 +0200 -+++ head-2006-09-21/arch/i386/kernel/setup-xen.c 2006-09-21 10:48:48.000000000 +0200 -@@ -1810,8 +1810,12 @@ void __init setup_arch(char **cmdline_p) - #endif - #endif - } else { -+#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE) -+ conswitchp = &dummy_con; -+#else - extern int console_use_vt; - console_use_vt = 0; -+#endif - } - - tsc_init(); -Index: head-2006-09-21/arch/x86_64/kernel/setup-xen.c -=================================================================== ---- head-2006-09-21.orig/arch/x86_64/kernel/setup-xen.c 2006-09-21 10:47:50.000000000 +0200 -+++ head-2006-09-21/arch/x86_64/kernel/setup-xen.c 2006-09-21 10:48:48.000000000 +0200 -@@ -897,8 +897,12 @@ void __init setup_arch(char **cmdline_p) - #endif - #endif - } else { -+#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE) -+ conswitchp = &dummy_con; -+#else - extern int console_use_vt; - console_use_vt = 0; -+#endif - } - } - #else /* CONFIG_XEN */ -Index: head-2006-09-21/drivers/xen/Kconfig -=================================================================== ---- head-2006-09-21.orig/drivers/xen/Kconfig 2006-09-21 10:40:12.000000000 +0200 -+++ head-2006-09-21/drivers/xen/Kconfig 2006-09-21 10:48:48.000000000 +0200 -@@ -178,6 +178,29 @@ config XEN_CONSOLE - help - The Xen virtual console is ... - -+config XEN_FRAMEBUFFER -+ tristate "Framebuffer-device frontend driver" -+ depends on XEN && FB -+ select FB_CFB_FILLRECT -+ select FB_CFB_COPYAREA -+ select FB_CFB_IMAGEBLIT -+ default y -+ help -+ The framebuffer-device frontend drivers allows the kernel to create a -+ virtual framebuffer. This framebuffer can be viewed in another -+ domain. Unless this domain has access to a real video card, you -+ probably want to say Y here. -+ -+config XEN_KEYBOARD -+ tristate "Keyboard-device frontend driver" -+ depends on XEN -+ default y -+ help -+ The keyboard-device frontend driver allows the kernel to create a -+ virtual keyboard. This keyboard can then be driven by another -+ domain. If you've said Y to CONFIG_XEN_FRAMEBUFFER, you probably -+ want to say Y here. -+ - config XEN_SCRUB_PAGES - bool "Scrub memory before freeing it to Xen" - default y -Index: head-2006-09-21/drivers/xen/Makefile -=================================================================== ---- head-2006-09-21.orig/drivers/xen/Makefile 2006-09-21 09:57:56.000000000 +0200 -+++ head-2006-09-21/drivers/xen/Makefile 2006-09-21 10:48:48.000000000 +0200 -@@ -15,3 +15,5 @@ obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += blk - obj-$(CONFIG_XEN_NETDEV_FRONTEND) += netfront/ - obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback/ - obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += pcifront/ -+obj-$(CONFIG_XEN_FRAMEBUFFER) += xenfb/ -+obj-$(CONFIG_XEN_KEYBOARD) += xenkbd/ -Index: head-2006-09-21/drivers/xen/xenfb/Makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ head-2006-09-21/drivers/xen/xenfb/Makefile 2006-09-21 10:48:48.000000000 +0200 -@@ -0,0 +1 @@ -+obj-$(CONFIG_XEN_FRAMEBUFFER) := xenfb.o -Index: head-2006-09-21/drivers/xen/xenfb/xenfb.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ head-2006-09-21/drivers/xen/xenfb/xenfb.c 2006-09-21 10:48:48.000000000 +0200 -@@ -0,0 +1,567 @@ -+/* -+ * linux/drivers/video/xenfb.c -- Xen para-virtual frame buffer device -+ * -+ * Copyright (C) 2005-2006 -+ * -+ * Anthony Liguori <aliguori@us.ibm.com> -+ * -+ * Based on linux/drivers/video/q40fb.c -+ * -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file COPYING in the main directory of this archive for -+ * more details. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/errno.h> -+#include <linux/fb.h> -+#include <linux/module.h> -+#include <linux/vmalloc.h> -+#include <linux/mm.h> -+#include <asm/hypervisor.h> -+#include <xen/evtchn.h> -+#include <xen/xenbus.h> -+#include <linux/xenfb.h> -+#include <linux/kthread.h> -+ -+static int xenfb_fps = 20; -+static unsigned long xenfb_mem_len = 2 * 1024 * 1024; -+ -+struct xenfb_mapping -+{ -+ struct list_head next; -+ struct vm_area_struct *vma; -+ atomic_t map_refs; -+ int faults; -+ struct xenfb_info *info; -+}; -+ -+struct xenfb_info -+{ -+ struct task_struct *kthread; -+ wait_queue_head_t wq; -+ -+ unsigned char *fb; -+ struct fb_fix_screeninfo *fix; -+ struct fb_var_screeninfo *var; -+ struct fb_info *fb_info; -+ struct timer_list refresh; -+ int dirty; -+ int y1, y2; -+ int x1, x2; -+ -+ struct semaphore mm_lock; -+ int nr_pages; -+ struct page **pages; -+ struct list_head mappings; -+ -+ unsigned evtchn; -+ struct xenfb_page *page; -+ unsigned long *mfns; -+}; -+ -+static void xenfb_do_update(struct xenfb_info *info, -+ int x, int y, int w, int h) -+{ -+ union xenfb_out_event event; -+ __u32 prod; -+ -+ event.type = XENFB_TYPE_UPDATE; -+ event.update.x = x; -+ event.update.y = y; -+ event.update.width = w; -+ event.update.height = h; -+ -+ prod = info->page->out_prod; -+ if (prod - info->page->out_cons == XENFB_RING_SIZE(info->page->out)) -+ return; /* ring buffer full, event lost */ -+ XENFB_RING_REF(info->page->out, prod) = event; -+ info->page->out_prod = prod + 1; -+ -+ notify_remote_via_evtchn(info->evtchn); -+} -+ -+static int xenfb_queue_full(struct xenfb_info *info) -+{ -+ __u32 cons, prod; -+ -+ prod = info->page->out_prod; -+ cons = info->page->out_cons; -+ return prod - cons == XENFB_RING_SIZE(info->page->out); -+} -+ -+static void xenfb_update_screen(struct xenfb_info *info) -+{ -+ int y1, y2, x1, x2; -+ struct list_head *item; -+ struct xenfb_mapping *map; -+ -+ if (xenfb_queue_full(info)) -+ return; -+ -+ y1 = info->y1; -+ y2 = info->y2; -+ x1 = info->x1; -+ x2 = info->x2; -+ info->dirty = info->y1 = info->y2 = info->x1 = info->x2 = 0; -+ down(&info->mm_lock); -+ list_for_each(item, &info->mappings) { -+ map = list_entry(item, struct xenfb_mapping, next); -+ if (!map->faults) -+ continue; -+ zap_page_range(map->vma, map->vma->vm_start, -+ map->vma->vm_end - map->vma->vm_start, NULL); -+ map->faults = 0; -+ } -+ up(&info->mm_lock); -+ -+ xenfb_do_update(info, x1, y1, x2 - x1, y2 - y1); -+} -+ -+static int xenfb_thread(void *data) -+{ -+ struct xenfb_info *info = data; -+ DECLARE_WAITQUEUE(wait, current); -+ -+ add_wait_queue(&info->wq, &wait); -+ for (;;) { -+ if (kthread_should_stop()) -+ break; -+ if (info->dirty) -+ xenfb_update_screen(info); -+ set_current_state(TASK_INTERRUPTIBLE); -+ schedule(); -+ } -+ remove_wait_queue(&info->wq, &wait); -+ return 0; -+} -+ -+static int xenfb_setcolreg(unsigned regno, unsigned red, unsigned green, -+ unsigned blue, unsigned transp, -+ struct fb_info *info) -+{ -+ u32 v; -+ -+ if (regno > info->cmap.len) -+ return 1; -+ -+ red >>= (16 - info->var.red.length); -+ green >>= (16 - info->var.green.length); -+ blue >>= (16 - info->var.blue.length); -+ -+ v = (red << info->var.red.offset) | -+ (green << info->var.green.offset) | -+ (blue << info->var.blue.offset); -+ -+ switch (info->var.bits_per_pixel) { -+ case 16: -+ case 24: -+ case 32: -+ ((u32 *)info->pseudo_palette)[regno] = v; -+ break; -+ } -+ -+ return 0; -+} -+ -+static void xenfb_timer(unsigned long data) -+{ -+ struct xenfb_info *info = (struct xenfb_info *)data; -+ info->dirty++; -+ wake_up(&info->wq); -+} -+ -+static void xenfb_refresh(struct xenfb_info *info, -+ int x1, int y1, int w, int h) -+{ -+ int y2, x2; -+ -+ y2 = y1 + h; -+ x2 = x1 + w; -+ if (info->y2 == 0) { -+ info->y1 = y1; -+ info->y2 = y2; -+ } -+ if (info->x2 == 0) { -+ info->x1 = x1; -+ info->x2 = x2; -+ } -+ -+ if (info->y1 > y1) -+ info->y1 = y1; -+ if (info->y2 < y2) -+ info->y2 = y2; -+ if (info->x1 > x1) -+ info->x1 = x1; -+ if (info->x2 < x2) -+ info->x2 = x2; -+ -+ if (timer_pending(&info->refresh)) -+ return; -+ -+ mod_timer(&info->refresh, jiffies + HZ/xenfb_fps); -+} -+ -+static void xenfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) -+{ -+ struct xenfb_info *info = p->par; -+ -+ cfb_fillrect(p, rect); -+ xenfb_refresh(info, rect->dx, rect->dy, rect->width, rect->height); -+} -+ -+static void xenfb_imageblit(struct fb_info *p, const struct fb_image *image) -+{ -+ struct xenfb_info *info = p->par; -+ -+ cfb_imageblit(p, image); -+ xenfb_refresh(info, image->dx, image->dy, image->width, image->height); -+} -+ -+static void xenfb_copyarea(struct fb_info *p, const struct fb_copyarea *area) -+{ -+ struct xenfb_info *info = p->par; -+ -+ cfb_copyarea(p, area); -+ xenfb_refresh(info, area->dx, area->dy, area->width, area->height); -+} -+ -+static void xenfb_vm_open(struct vm_area_struct *vma) -+{ -+ struct xenfb_mapping *map = vma->vm_private_data; -+ atomic_inc(&map->map_refs); -+} -+ -+static void xenfb_vm_close(struct vm_area_struct *vma) -+{ -+ struct xenfb_mapping *map = vma->vm_private_data; -+ struct xenfb_info *info = map->info; -+ -+ down(&info->mm_lock); -+ if (atomic_dec_and_test(&map->map_refs)) { -+ list_del(&map->next); -+ kfree(map); -+ } -+ up(&info->mm_lock); -+} -+ -+static struct page *xenfb_vm_nopage(struct vm_area_struct *vma, -+ unsigned long vaddr, int *type) -+{ -+ struct xenfb_mapping *map = vma->vm_private_data; -+ struct xenfb_info *info = map->info; -+ int pgnr = (vaddr - vma->vm_start) >> PAGE_SHIFT; -+ struct page *page; -+ int y1, y2; -+ -+ if (pgnr >= info->nr_pages) -+ return NOPAGE_SIGBUS; -+ -+ down(&info->mm_lock); -+ page = info->pages[pgnr]; -+ get_page(page); -+ map->faults++; -+ -+ y1 = pgnr * PAGE_SIZE / info->fix->line_length; -+ y2 = (pgnr * PAGE_SIZE + PAGE_SIZE - 1) / info->fix->line_length; -+ if (y2 > info->var->yres) -+ y2 = info->var->yres; -+ xenfb_refresh(info, 0, y1, info->var->xres, y2 - y1); -+ up(&info->mm_lock); -+ -+ if (type) -+ *type = VM_FAULT_MINOR; -+ -+ return page; -+} -+ -+static struct vm_operations_struct xenfb_vm_ops = { -+ .open = xenfb_vm_open, -+ .close = xenfb_vm_close, -+ .nopage = xenfb_vm_nopage, -+}; -+ -+static int xenfb_mmap(struct fb_info *fb_info, struct vm_area_struct *vma) -+{ -+ struct xenfb_info *info = fb_info->par; -+ struct xenfb_mapping *map; -+ int ret; -+ int map_pages; -+ -+ down(&info->mm_lock); -+ -+ ret = -EINVAL; -+ if (!(vma->vm_flags & VM_WRITE)) -+ goto out; -+ if (!(vma->vm_flags & VM_SHARED)) -+ goto out; -+ if (vma->vm_pgoff != 0) -+ goto out; -+ -+ map_pages = (vma->vm_end - vma->vm_start + PAGE_SIZE-1) >> PAGE_SHIFT; -+ if (map_pages > info->nr_pages) -+ goto out; -+ -+ ret = -ENOMEM; -+ map = kmalloc(sizeof(*map), GFP_KERNEL); -+ if (map == NULL) -+ goto out; -+ memset(map, 0, sizeof(*map)); -+ -+ map->vma = vma; -+ map->faults = 0; -+ map->info = info; -+ atomic_set(&map->map_refs, 1); -+ list_add(&map->next, &info->mappings); -+ vma->vm_ops = &xenfb_vm_ops; -+ vma->vm_flags |= (VM_DONTEXPAND | VM_RESERVED); -+ vma->vm_private_data = map; -+ ret = 0; -+ -+ out: -+ up(&info->mm_lock); -+ return ret; -+} -+ -+static struct fb_ops xenfb_fb_ops = { -+ .owner = THIS_MODULE, -+ .fb_setcolreg = xenfb_setcolreg, -+ .fb_fillrect = xenfb_fillrect, -+ .fb_copyarea = xenfb_copyarea, -+ .fb_imageblit = xenfb_imageblit, -+ .fb_mmap = xenfb_mmap, -+}; -+ -+static irqreturn_t xenfb_event_handler(int rq, void *dev_id, -+ struct pt_regs *regs) -+{ -+ struct xenfb_info *info = dev_id; -+ __u32 cons, prod; -+ -+ if (!info->page || !info->page->initialized) -+ return IRQ_NONE; -+ -+ prod = info->page->in_prod; -+ rmb(); /* ensure we see ring contents up to prod */ -+ for (cons = info->page->in_cons; cons != prod; cons++) { -+ union xenfb_in_event *event; -+ event = &XENFB_RING_REF(info->page->in, cons); -+ notify_remote_via_evtchn(info->evtchn); -+ } -+ /* FIXME do I need a wmb() here? */ -+ info->page->in_cons = cons; -+ -+ return IRQ_HANDLED; -+} -+ -+static unsigned long vmalloc_to_mfn(void *address) -+{ -+ return pfn_to_mfn(vmalloc_to_pfn(address)); -+} -+ -+static struct xenfb_info *xenfb_info; -+static int xenfb_irq; -+ -+static int __init xenfb_probe(void) -+{ -+ struct xenfb_info *info; -+ int i, ret; -+ struct fb_info *fb_info; -+ struct evtchn_alloc_unbound alloc_unbound; -+ struct xenbus_transaction xbt; -+ -+ info = kmalloc(sizeof(*info), GFP_KERNEL); -+ if (info == NULL) -+ return -ENOMEM; -+ memset(info, 0, sizeof(*info)); -+ -+ INIT_LIST_HEAD(&info->mappings); -+ -+ info->fb = vmalloc(xenfb_mem_len); -+ if (info->fb == NULL) -+ goto error; -+ memset(info->fb, 0, xenfb_mem_len); -+ info->nr_pages = (xenfb_mem_len + PAGE_SIZE - 1) >> PAGE_SHIFT; -+ info->pages = kmalloc(sizeof(struct page*)*info->nr_pages, GFP_KERNEL); -+ if (info->pages == NULL) -+ goto error_vfree; -+ for (i = 0; i < info->nr_pages; i++) -+ info->pages[i] = vmalloc_to_page(info->fb + i * PAGE_SIZE); -+ -+ fb_info = framebuffer_alloc(sizeof(u32) * 256, NULL); -+ if (fb_info == NULL) -+ goto error_kfree; -+ -+ info->mfns = vmalloc(sizeof(unsigned long) * info->nr_pages); -+ /* set up shared page */ -+ info->page = (void *)__get_free_page(GFP_KERNEL); -+ if (!info->page) -+ goto error_kfree; -+ /* set up event channel */ -+ alloc_unbound.dom = DOMID_SELF; -+ alloc_unbound.remote_dom = 0; -+ ret = HYPERVISOR_event_channel_op(EVTCHNOP_alloc_unbound, -+ &alloc_unbound); -+ if (ret) -+ goto error_freep; -+ info->evtchn = alloc_unbound.port; -+ -+ for (i = 0; i < info->nr_pages; i++) -+ info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE); -+ info->page->pd[0] = vmalloc_to_mfn(info->mfns); -+ info->page->width = 800; -+ info->page->height = 600; -+ info->page->depth = 32; -+ info->page->line_length = (info->page->depth / 8) * info->page->width; -+ info->page->mem_length = xenfb_mem_len; -+ info->page->in_cons = info->page->in_prod = 0; -+ info->page->out_cons = info->page->out_prod = 0; -+ -+ ret = bind_evtchn_to_irqhandler(info->evtchn, xenfb_event_handler, -+ 0, "xenfb", info); -+ if (ret < 0) -+ // FIXME need to close evtchn? -+ goto error_kfree; -+ -+ xenfb_irq = ret; -+ xenfb_info = info; -+ -+ fb_info->pseudo_palette = fb_info->par; -+ fb_info->par = info; -+ fb_info->screen_base = info->fb; -+ -+ memset(&fb_info->var, 0, sizeof(fb_info->var)); -+ memset(&fb_info->fix, 0, sizeof(fb_info->fix)); -+ -+ fb_info->fbops = &xenfb_fb_ops; -+ fb_info->var.xres_virtual = fb_info->var.xres = info->page->width; -+ fb_info->var.yres_virtual = fb_info->var.yres = info->page->height; -+ fb_info->var.bits_per_pixel = info->page->depth; -+ -+ fb_info->var.red = (struct fb_bitfield){16, 8, 0}; -+ fb_info->var.green = (struct fb_bitfield){8, 8, 0}; -+ fb_info->var.blue = (struct fb_bitfield){0, 8, 0}; -+ -+ fb_info->var.activate = FB_ACTIVATE_NOW; -+ fb_info->var.height = -1; -+ fb_info->var.width = -1; -+ fb_info->var.vmode = FB_VMODE_NONINTERLACED; -+ -+ fb_info->fix.visual = FB_VISUAL_TRUECOLOR; -+ fb_info->fix.line_length = info->page->line_length; -+ fb_info->fix.smem_start = 0; -+ fb_info->fix.smem_len = xenfb_mem_len; -+ strcpy(fb_info->fix.id, "xen"); -+ fb_info->fix.type = FB_TYPE_PACKED_PIXELS; -+ fb_info->fix.accel = FB_ACCEL_NONE; -+ -+ fb_info->flags = FBINFO_FLAG_DEFAULT; -+ -+ fb_alloc_cmap(&fb_info->cmap, 256, 0); -+ -+ info->fb_info = fb_info; -+ info->fix = &fb_info->fix; -+ info->var = &fb_info->var; -+ -+ init_MUTEX(&info->mm_lock); -+ init_waitqueue_head(&info->wq); -+ init_timer(&info->refresh); -+ info->refresh.function = xenfb_timer; -+ info->refresh.data = (unsigned long)info; -+ -+ info->kthread = kthread_run(xenfb_thread, info, "xenfb thread"); -+ -+ ret = register_framebuffer(fb_info); -+ if (ret) -+ goto error_unbind; -+ -+ again: -+ ret = xenbus_transaction_start(&xbt); -+ if (ret) -+ goto error_unreg; -+ ret = xenbus_printf(xbt, "vfb", "page-ref", "%lu", -+ virt_to_mfn(info->page)); -+ if (ret) -+ goto error_xenbus; -+ ret = xenbus_printf(xbt, "vfb", "event-channel", "%u", -+ info->evtchn); -+ if (ret) -+ goto error_xenbus; -+ ret = xenbus_transaction_end(xbt, 0); -+ if (ret) { -+ if (ret == -EAGAIN) -+ goto again; -+ goto error_unreg; -+ } -+ -+ info->page->initialized = 1; /* FIXME needed? move up? */ -+ -+ return 0; -+ -+ error_xenbus: -+ xenbus_transaction_end(xbt, 1); -+ error_unreg: -+ unregister_framebuffer(fb_info); -+ error_unbind: -+ unbind_from_irqhandler(xenfb_irq, info); -+ xenfb_irq = 0; -+ error_freep: -+ free_page((unsigned long)info->page); -+ error_kfree: -+ kfree(info->pages); -+ error_vfree: -+ vfree(info->fb); -+ error: -+ kfree(info); -+ xenfb_info = NULL; -+ -+ return -ENODEV; -+} -+ -+void xenfb_resume(void) -+{ -+#if 0 /* FIXME */ -+ int i, ret; -+ -+ xenfb_info->page = mfn_to_virt(xen_start_info->fbdev_mfn); -+ for (i = 0; i < xenfb_info->nr_pages; i++) -+ xenfb_info->mfns[i] = vmalloc_to_mfn(xenfb_info->fb + i * PAGE_SIZE); -+ xenfb_info->page->pd[0] = vmalloc_to_mfn(xenfb_info->mfns); -+ -+ if (xenfb_irq) -+ unbind_from_irqhandler(xenfb_irq, NULL); -+ -+ printk("xenfb: resume(%d)\n", xen_start_info->fbdev_evtchn); -+ ret = bind_evtchn_to_irqhandler(xen_start_info->fbdev_evtchn, -+ xenfb_event_handler, 0, "xenfb", xenfb_info); -+ if (ret <= 0) -+ return; -+ xenfb_irq = ret; -+#else -+ printk(KERN_DEBUG "xenfb_resume not implemented\n"); -+#endif -+} -+ -+static int __init xenfb_init(void) -+{ -+ return xenfb_probe(); -+} -+ -+static void __exit xenfb_cleanup(void) -+{ -+ struct xenfb_info *info = xenfb_info; -+ -+ unregister_framebuffer(info->fb_info); -+ unbind_from_irqhandler(xenfb_irq, info); -+ xenfb_irq = 0; -+ free_page((unsigned long)info->page); -+ kfree(info->pages); -+ vfree(info->fb); -+ kfree(info); -+ xenfb_info = NULL; -+} -+ -+module_init(xenfb_init); -+module_exit(xenfb_cleanup); -+ -+MODULE_LICENSE("GPL"); -Index: head-2006-09-21/drivers/xen/xenkbd/Makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ head-2006-09-21/drivers/xen/xenkbd/Makefile 2006-09-21 10:48:48.000000000 +0200 -@@ -0,0 +1 @@ -+obj-$(CONFIG_XEN_KEYBOARD) += xenkbd.o -Index: head-2006-09-21/drivers/xen/xenkbd/xenkbd.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ head-2006-09-21/drivers/xen/xenkbd/xenkbd.c 2006-09-21 10:48:48.000000000 +0200 -@@ -0,0 +1,205 @@ -+/* -+ * linux/drivers/input/keyboard/xenkbd.c -- Xen para-virtual input device -+ * -+ * Copyright (C) 2005 -+ * -+ * Anthony Liguori <aliguori@us.ibm.com> -+ * -+ * Based on linux/drivers/input/mouse/sermouse.c -+ * -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file COPYING in the main directory of this archive for -+ * more details. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/errno.h> -+#include <linux/module.h> -+#include <linux/input.h> -+#include <asm/hypervisor.h> -+#include <xen/evtchn.h> -+#include <xen/xenbus.h> -+#include <linux/xenkbd.h> -+ -+struct xenkbd_device -+{ -+ struct input_dev *dev; -+ struct xenkbd_info *info; -+ unsigned evtchn; -+}; -+ -+static irqreturn_t input_handler(int rq, void *dev_id, struct pt_regs *regs) -+{ -+ struct xenkbd_device *dev = dev_id; -+ struct xenkbd_info *info = dev ? dev->info : 0; -+ static int button_map[3] = { BTN_RIGHT, BTN_MIDDLE, BTN_LEFT }; -+ __u32 cons, prod; -+ -+ if (!info || !info->initialized) -+ return IRQ_NONE; -+ -+ prod = info->in_prod; -+ rmb(); /* ensure we see ring contents up to prod */ -+ for (cons = info->in_cons; cons != prod; cons++) { -+ union xenkbd_in_event *event; -+ event = &XENKBD_RING_REF(info->in, cons); -+ -+ switch (event->type) { -+ case XENKBD_TYPE_MOTION: -+ input_report_rel(dev->dev, REL_X, event->motion.rel_x); -+ input_report_rel(dev->dev, REL_Y, event->motion.rel_y); -+ break; -+ case XENKBD_TYPE_BUTTON: -+ if (event->button.button < 3) -+ input_report_key(dev->dev, -+ button_map[event->button.button], -+ event->button.pressed); -+ break; -+ case XENKBD_TYPE_KEY: -+ input_report_key(dev->dev, event->key.keycode, event->key.pressed); -+ break; -+ } -+ -+ notify_remote_via_evtchn(dev->evtchn); -+ } -+ input_sync(dev->dev); -+ /* FIXME do I need a wmb() here? */ -+ info->in_cons = cons; -+ -+ return IRQ_HANDLED; -+} -+ -+static struct xenkbd_device *xenkbd_dev; -+static int xenkbd_irq; -+ -+int __init xenkbd_init(void) -+{ -+ int ret = 0; -+ int i; -+ struct xenkbd_device *dev; -+ struct input_dev *input_dev; -+ struct evtchn_alloc_unbound alloc_unbound; -+ struct xenbus_transaction xbt; -+ -+ dev = kmalloc(sizeof(*dev), GFP_KERNEL); -+ input_dev = input_allocate_device(); -+ if (!dev || !input_dev) -+ return -ENOMEM; -+ -+ dev->dev = input_dev; -+ dev->info = (void *)__get_free_page(GFP_KERNEL); -+ if (!dev->info) { -+ ret = -ENOMEM; -+ goto error; -+ } -+ dev->info->initialized = 0; -+ -+ alloc_unbound.dom = DOMID_SELF; -+ alloc_unbound.remote_dom = 0; -+ ret = HYPERVISOR_event_channel_op(EVTCHNOP_alloc_unbound, -+ &alloc_unbound); -+ if (ret) -+ goto error_freep; -+ dev->evtchn = alloc_unbound.port; -+ ret = bind_evtchn_to_irqhandler(dev->evtchn, input_handler, 0, -+ "xenkbd", dev); -+ if (ret < 0) -+ goto error_freep; -+ -+ xenkbd_irq = ret; -+ -+ input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); -+ input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT); -+ input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y); -+ -+ /* FIXME not sure this is quite right */ -+ for (i = 0; i < 256; i++) -+ set_bit(i, input_dev->keybit); -+ -+ input_dev->name = "Xen Virtual Keyboard/Mouse"; -+ -+ input_register_device(input_dev); -+ -+ again: -+ ret = xenbus_transaction_start(&xbt); -+ if (ret) -+ goto error_unreg; -+ ret = xenbus_printf(xbt, "vkbd", "page-ref", "%lu", -+ virt_to_mfn(dev->info)); -+ if (ret) -+ goto error_xenbus; -+ ret = xenbus_printf(xbt, "vkbd", "event-channel", "%u", -+ dev->evtchn); -+ if (ret) -+ goto error_xenbus; -+ ret = xenbus_transaction_end(xbt, 0); -+ if (ret) { -+ if (ret == -EAGAIN) -+ goto again; -+ /* FIXME really retry forever? */ -+ goto error_unreg; -+ } -+ -+ dev->info->in_cons = dev->info->in_prod = 0; -+ dev->info->out_cons = dev->info->out_prod = 0; -+ dev->info->initialized = 1; /* FIXME needed? move up? */ -+ -+ xenkbd_dev = dev; -+ -+ return ret; -+ -+ -+ error_xenbus: -+ xenbus_transaction_end(xbt, 1); -+ error_unreg: -+ input_unregister_device(input_dev); -+ unbind_from_irqhandler(xenkbd_irq, dev); -+ xenkbd_irq = 0; -+ error_freep: -+ free_page((unsigned long)dev->info); -+ error: -+ kfree(dev); -+ xenkbd_dev = NULL; -+ return ret; -+} -+ -+static void __exit xenkbd_cleanup(void) -+{ -+ input_unregister_device(xenkbd_dev->dev); -+ unbind_from_irqhandler(xenkbd_irq, xenkbd_dev); -+ xenkbd_irq = 0; -+ free_page((unsigned long)xenkbd_dev->info); -+ kfree(xenkbd_dev); -+ xenkbd_dev = NULL; -+} -+ -+void xenkbd_resume(void) -+{ -+#if 0 /* FIXME */ -+ int ret; -+ -+ if (xenkbd_dev && xen_start_info->kbd_evtchn) { -+ if (xenkbd_irq) -+ unbind_from_irqhandler(xenkbd_irq, NULL); -+ -+ ret = bind_evtchn_to_irqhandler(xen_start_info->kbd_evtchn, -+ input_handler, -+ 0, -+ "xenkbd", -+ xenkbd_dev); -+ -+ if (ret <= 0) -+ return; -+ -+ xenkbd_irq = ret; -+ xenkbd_dev->info = mfn_to_virt(xen_start_info->kbd_mfn); -+ } -+#else -+ printk(KERN_DEBUG "xenkbd_resume not implemented\n"); -+#endif -+} -+ -+module_init(xenkbd_init); -+module_exit(xenkbd_cleanup); -+ -+MODULE_LICENSE("GPL"); -Index: head-2006-09-21/include/linux/xenfb.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ head-2006-09-21/include/linux/xenfb.h 2006-09-21 10:48:48.000000000 +0200 -@@ -0,0 +1,97 @@ -+/* -+ * linux/include/linux/xenfb.h -- Xen virtual frame buffer device -+ * -+ * Copyright (C) 2005 -+ * -+ * Anthony Liguori <aliguori@us.ibm.com> -+ * -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file COPYING in the main directory of this archive for -+ * more details. -+ */ -+ -+#ifndef _LINUX_XENFB_H -+#define _LINUX_XENFB_H -+ -+#include <asm/types.h> -+ -+/* out events */ -+ -+#define XENFB_TYPE_MOTION 1 -+#define XENFB_TYPE_UPDATE 2 -+ -+struct xenfb_motion -+{ -+ __u8 type; /* XENFB_TYPE_MOTION */ -+ __u16 x; /* The new x coordinate */ -+ __u16 y; /* The new y coordinate */ -+}; -+ -+struct xenfb_update -+{ -+ __u8 type; /* XENFB_TYPE_UPDATE */ -+ __u16 x; /* source x */ -+ __u16 y; /* source y */ -+ __u16 width; /* rect width */ -+ __u16 height; /* rect height */ -+}; -+ -+union xenfb_out_event -+{ -+ __u8 type; -+ struct xenfb_motion motion; -+ struct xenfb_update update; -+ char _[40]; -+}; -+ -+/* in events */ -+ -+#define XENFB_TYPE_SET_EVENTS 1 -+ -+#define XENFB_FLAG_MOTION 1 -+#define XENFB_FLAG_UPDATE 2 -+#define XENFB_FLAG_COPY 4 -+#define XENFB_FLAG_FILL 8 -+ -+struct xenfb_set_events -+{ -+ __u8 type; /* XENFB_TYPE_SET_EVENTS */ -+ __u32 flags; /* combination of XENFB_FLAG_* */ -+}; -+ -+union xenfb_in_event -+{ -+ __u8 type; -+ struct xenfb_set_events set_events; -+ char _[40]; -+}; -+ -+/* shared page */ -+ -+#define XENFB_IN_RING_SIZE (1024 / 40) -+#define XENFB_OUT_RING_SIZE (2048 / 40) -+ -+#define XENFB_RING_SIZE(ring) (sizeof((ring)) / sizeof(*(ring))) -+#define XENFB_RING_REF(ring, idx) (ring)[(idx) % XENFB_RING_SIZE((ring))] -+ -+struct xenfb_page -+{ -+ __u8 initialized; -+ __u16 width; /* the width of the framebuffer (in pixels) */ -+ __u16 height; /* the height of the framebuffer (in pixels) */ -+ __u32 line_length; /* the length of a row of pixels (in bytes) */ -+ __u32 mem_length; /* the length of the framebuffer (in bytes) */ -+ __u8 depth; /* the depth of a pixel (in bits) */ -+ -+ unsigned long pd[2]; -+ -+ __u32 in_cons, in_prod; -+ __u32 out_cons, out_prod; -+ -+ union xenfb_in_event in[XENFB_IN_RING_SIZE]; -+ union xenfb_out_event out[XENFB_OUT_RING_SIZE]; -+}; -+ -+void xenfb_resume(void); -+ -+#endif -Index: head-2006-09-21/include/linux/xenkbd.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ head-2006-09-21/include/linux/xenkbd.h 2006-09-21 10:48:48.000000000 +0200 -@@ -0,0 +1,82 @@ -+/* -+ * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse -+ * -+ * Copyright (C) 2005 -+ * -+ * Anthony Liguori <aliguori@us.ibm.com> -+ * -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file COPYING in the main directory of this archive for -+ * more details. -+ */ -+ -+#ifndef _LINUX_XENKBD_H -+#define _LINUX_XENKBD_H -+ -+#include <asm/types.h> -+ -+/* in events */ -+ -+#define XENKBD_TYPE_MOTION 1 /* mouse movement event */ -+#define XENKBD_TYPE_BUTTON 2 /* mouse button event */ -+#define XENKBD_TYPE_KEY 3 /* keyboard event */ -+ -+struct xenkbd_motion -+{ -+ __u8 type; /* XENKBD_TYPE_MOTION */ -+ __s16 rel_x; /* relative X motion */ -+ __s16 rel_y; /* relative Y motion */ -+}; -+ -+struct xenkbd_button -+{ -+ __u8 type; /* XENKBD_TYPE_BUTTON */ -+ __u8 pressed; /* 1 if pressed; 0 otherwise */ -+ __u8 button; /* the button (0, 1, 2 is right, middle, left) */ -+}; -+ -+struct xenkbd_key -+{ -+ __u8 type; /* XENKBD_TYPE_KEY */ -+ __u8 pressed; /* 1 if pressed; 0 otherwise */ -+ __u16 keycode; /* KEY_* from linux/input.h */ -+}; -+ -+union xenkbd_in_event -+{ -+ __u8 type; -+ struct xenkbd_motion motion; -+ struct xenkbd_button button; -+ struct xenkbd_key key; -+ char _[40]; -+}; -+ -+/* out events */ -+ -+union xenkbd_out_event -+{ -+ __u8 type; -+ char _[40]; -+}; -+ -+/* shared page */ -+ -+#define XENKBD_IN_RING_SIZE (2048 / 40) -+#define XENKBD_OUT_RING_SIZE (1024 / 40) -+ -+#define XENKBD_RING_SIZE(ring) (sizeof((ring)) / sizeof(*(ring))) -+#define XENKBD_RING_REF(ring, idx) (ring)[(idx) % XENKBD_RING_SIZE((ring))] -+ -+struct xenkbd_info -+{ -+ __u8 initialized; -+ __u32 in_cons, in_prod; -+ __u32 out_cons, out_prod; -+ -+ union xenkbd_in_event in[XENKBD_IN_RING_SIZE]; -+ union xenkbd_out_event out[XENKBD_OUT_RING_SIZE]; -+}; -+ -+void xenkbd_resume(void); -+ -+#endif -Index: head-2006-09-21/mm/memory.c -=================================================================== ---- head-2006-09-21.orig/mm/memory.c 2006-09-21 10:20:49.000000000 +0200 -+++ head-2006-09-21/mm/memory.c 2006-09-21 10:48:48.000000000 +0200 -@@ -895,6 +895,7 @@ unsigned long zap_page_range(struct vm_a - tlb_finish_mmu(tlb, address, end); - return end; - } -+EXPORT_SYMBOL_GPL(zap_page_range); - - /* - * Do a quick page-table lookup for a single page. ++++++ series.conf ++++++ --- kernel-source/series.conf 2006-09-28 01:32:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2006-10-01 22:15:20.000000000 +0200 @@ -181,6 +181,10 @@ +agruen patches.suse/ext3-register-filesystem-lifo patches.suse/ext3-barrier-default + # NFSv4 ACL support (agruen -- experimental) + patches.suse/parser-match_string.diff + patches.suse/nfs4acl-ext3.diff + ######################################################## # reiser ######################################################## @@ -303,7 +307,8 @@ ######################################################## patches.fixes/kmalloc-max patches.fixes/parport-mutex -+rw patches.fixes/serial8250_console_write-ier ++49840 patches.fixes/serial8250_console_write-ier ++49840 patches.fixes/fix-serial-8250-UART_BUG_TXEN-test # suse-2.4 compatible crypto loop driver patches.suse/twofish-2.6 @@ -320,6 +325,7 @@ # patches.drivers/libata-acpi-suspend # patches.drivers/libata-acpi-suspend-doc-fix patches.fixes/dm-suspend-resume-events + patches.suse/uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch ######################################################## @@ -411,7 +417,6 @@ patches.arch/disable-apic-error patches.fixes/dm_check_device_area.diff patches.drivers/ixgb-eeh.patch - patches.fixes/fix-serial-8250-UART_BUG_TXEN-test patches.fixes/invalidate_page_non_destructive patches.fixes/nf_bridge-header-size @@ -425,7 +430,6 @@ patches.fixes/remount-no-shrink-dcache patches.suse/sysctl-add-affinity_load_balancing - patches.fixes/ipmi-unload-crash patches.fixes/loop-barriers # PLEASE KEEP THESE PATCHES AT THE END OF series.conf @@ -513,5 +517,3 @@ patches.xen/xen-x86-dcr-fallback patches.xen/xen-x86-no-lapic patches.xen/xen-x86-no-ioapic-base - patches.xen/xen-vfb-frontend - patches.xen/xen-vfb-dom0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org