Hello community,
here is the log from the commit of package kernel-source
checked in at Wed Mar 21 09:13:30 CET 2007.
--------
--- kernel-source/kernel-bigsmp.changes 2007-03-16 09:01:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-03-21 08:34:20.000000000 +0100
@@ -1,0 +2,22 @@
+Tue Mar 20 13:09:40 CET 2007 - olh@suse.de
+
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+
+-------------------------------------------------------------------
+Tue Mar 20 07:08:26 CET 2007 - teheo@suse.de
+
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+
+-------------------------------------------------------------------
+Mon Mar 19 14:15:02 CET 2007 - olh@suse.de
+
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+
+-------------------------------------------------------------------
+Sun Mar 18 22:58:29 CET 2007 - olh@suse.de
+
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
+
+-------------------------------------------------------------------
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.t20580/_old 2007-03-21 09:06:04.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.20.2)
+# spec file for package kernel-bigsmp (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: Kernel with PAE Support
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
Provides: k_smp4G
@@ -147,12 +147,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-bigsmp-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -490,6 +490,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:04.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.20.2)
+# spec file for package kernel-debug (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: A Debug Version of the Kernel
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -152,12 +152,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-debug-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-debug-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -495,6 +495,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:05.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-default (Version 2.6.20.2)
+# spec file for package kernel-default (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
%ifarch alpha
@@ -173,12 +173,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-default-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-default-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -516,6 +516,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:05.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-dummy (Version 2.6.20.2)
+# spec file for package kernel-dummy (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@
Name: kernel-dummy
URL: http://www.kernel.org/
Summary: Internal dummy package for synchronizing release numbers
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: off
@@ -28,7 +28,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%install
@@ -41,6 +41,16 @@
/etc/dummy
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:05.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-iseries64 (Version 2.6.20.2)
+# spec file for package kernel-iseries64 (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: 64-Bit Kernel for iSeries
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
%ifarch ppc
@@ -148,12 +148,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-iseries64-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-iseries64-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -491,6 +491,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:05.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.20.2)
+# spec file for package kernel-kdump (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: kernel for kdump
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -157,12 +157,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-kdump-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -500,6 +500,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:05.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.20.2)
+# spec file for package kernel-ppc64 (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -37,8 +37,8 @@
%define build_vanilla 1
%endif
Summary: Kernel for ppc64 Systems
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Kernel
Autoreqprov: on
@@ -75,7 +75,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
%ifarch ppc
@@ -162,12 +162,12 @@
Tom Gall
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-ppc64-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -505,6 +505,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:06.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.20.2)
+# spec file for package kernel-s390 (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Standard Kernel
-Version: 2.6.20.2
-Release: 2
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
Provides: kernel-32bit k_deflt
@@ -145,12 +145,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-s390-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-s390-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -488,6 +488,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:06.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.20.2)
+# spec file for package kernel-source (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,8 +21,8 @@
%define source_rel %release
%endif
Summary: The Linux Kernel Sources
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: Development/Sources
Autoreqprov: off
@@ -106,7 +106,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -129,16 +129,16 @@
# Apply the patches needed for this architecture.
%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.20.2/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.20.2/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.20.2/$patch; then
+ > %_builddir/kernel-source-2.6.21_rc4_git5/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.21_rc4_git5/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.21_rc4_git5/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.20.2 %source_rel
-KERNELRELEASE=2.6.20.2-%source_rel
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.21_rc4_git5 %source_rel
+KERNELRELEASE=2.6.21-rc4-git5-%source_rel
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.20.2/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.20.2/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.21_rc4_git5/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.21_rc4_git5/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -295,6 +295,16 @@
%files -f kernel-source.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:06.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.20.2)
+# spec file for package kernel-syms (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,8 +13,8 @@
Name: kernel-syms
URL: http://www.kernel.org/
Summary: Kernel Symbol Versions (modversions)
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: Development/Sources
Autoreqprov: off
@@ -57,7 +57,7 @@
#!BuildIgnore: irqbalance xen
#!BuildIgnore: perl-Bootloader mkinitrd
Requires: linux
-Requires: kernel-source = 2.6.20.2-%release
+Requires: kernel-source = 2.6.21_rc4_git5-%release
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -90,7 +90,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
echo "Architecture symbol(s):" %symbols
@@ -137,6 +137,16 @@
/lib/modules/*/modules.alias
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:06.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-um (Version 2.6.20.2)
+# spec file for package kernel-um (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The User Mode Linux kernel.
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -153,12 +153,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-um-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-um-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -496,6 +496,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:06.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.20.2)
+# spec file for package kernel-vanilla (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Standard Kernel - without any SUSE patches
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
%ifarch alpha
@@ -165,12 +165,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-vanilla-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-vanilla-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -508,6 +508,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-xenpae.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:07.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xenpae (Version 2.6.20.2)
+# spec file for package kernel-xenpae (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Xen Kernel with PAE support
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
@@ -148,12 +148,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-xenpae-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-xenpae-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -491,6 +491,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.t20580/_old 2007-03-21 09:06:07.000000000 +0100
+++ /var/tmp/diff_new_pack.t20580/_new 2007-03-21 09:06:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xen (Version 2.6.20.2)
+# spec file for package kernel-xen (Version 2.6.21_rc4_git5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Xen Kernel
-Version: 2.6.20.2
-Release: 3
+Version: 2.6.21_rc4_git5
+Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
Autoreqprov: on
@@ -76,7 +76,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.20.2-%source_rel
+Provides: kernel = 2.6.21_rc4_git5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -151,12 +151,12 @@
-Source Timestamp: 2007/03/16 06:14:26 UTC
+Source Timestamp: 2007/03/20 21:37:51 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
- echo "The kernel-xen-2.6.20.2.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20.2.src.rpm."
+ echo "The kernel-xen-2.6.21_rc4_git5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.21_rc4_git5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -494,6 +494,16 @@
%files -f kernel.files
%changelog
+* Tue Mar 20 2007 - olh@suse.de
+- update to 2.6.21-rc4-git5, usb, libata, s390 fixes
+* Tue Mar 20 2007 - teheo@suse.de
+- patches.drivers/libata-sata_sil24-pci_id-for-adaptec-1220SA:
+ sata_sil24: Add Adaptec 1220SA PCI ID.
+* Mon Mar 19 2007 - olh@suse.de
+- enable pata drivers for cmd64x, mpc52xx, via and winbond on ppc32
+* Sun Mar 18 2007 - olh@suse.de
+- update to 2.6.21-rc4-git3
+ supported flag moved from U to N
* Fri Mar 16 2007 - teheo@suse.de
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured:
jmicron: make ide jmicron driver play nice with libata ones
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2007-03-16 09:01:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-03-21 08:34:16.000000000 +0100
@@ -1 +1 @@
-2007/03/16 06:14:26 UTC
+2007/03/20 21:37:51 UTC
++++++ config.tar.bz2 ++++++
++++ 14273 lines of diff (skipped)
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/disable-apic-error new/patches.arch/disable-apic-error
--- old/patches.arch/disable-apic-error 2007-01-13 11:00:22.000000000 +0100
+++ new/patches.arch/disable-apic-error 2007-03-20 09:43:23.000000000 +0100
@@ -23,7 +23,7 @@
*/
+#if 0
printk (KERN_DEBUG "APIC error on CPU%d: %02lx(%02lx)\n",
- smp_processor_id(), v , v1);
+ smp_processor_id(), v , v1);
+#endif
irq_exit();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-iseries-viocd-softlockup.patch new/patches.arch/ppc-iseries-viocd-softlockup.patch
--- old/patches.arch/ppc-iseries-viocd-softlockup.patch 2007-03-11 19:29:16.000000000 +0100
+++ new/patches.arch/ppc-iseries-viocd-softlockup.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
-Subject: Fix soft lockup with iSeries viocd driver
-From: Tony Breeds
-References: 167629 - LTC23734
-
-Fix soft lockup with iSeries viocd driver, caused by eventually calling
-end_that_request_first() with nr_bytes 0.
-
-Some versions of hald do an SG_IO ioctl on the viocd device which becomes a
-request with hard_nr_sectors and hard_cur_sectors set to zero. Passing zero
-as the number of sectors to end_request() (which calls
-end_that_request_first()) causes an infinite loop when the bio is being freed.
-
-This patch makes sure that the zero is never passed. It only requires some
-number larger the the request size the terminate the loop.
-
-The lockup is triggered by hald, interrogating the device.
-
-Signed-off-by: Tony Breeds
-Signed-off-by: Jens Axboe
-Cc: Stephen Rothwell
-Signed-off-by: Andrew Morton
-Signed-off-by: Olaf Hering
-
----
- drivers/cdrom/viocd.c | 27 +++++++++++++++++++++++----
- 1 file changed, 23 insertions(+), 4 deletions(-)
-
-Index: b/drivers/cdrom/viocd.c
-===================================================================
---- a/drivers/cdrom/viocd.c
-+++ b/drivers/cdrom/viocd.c
-@@ -376,6 +376,25 @@ static int send_request(struct request *
- return 0;
- }
-
-+static void viocd_end_request(struct request *req, int uptodate)
-+{
-+ int nsectors = req->hard_nr_sectors;
-+
-+ /*
-+ * Make sure it's fully ended, and ensure that we process
-+ * at least one sector.
-+ */
-+ if (blk_pc_request(req))
-+ nsectors = (req->data_len + 511) >> 9;
-+ if (!nsectors)
-+ nsectors = 1;
-+
-+ if (end_that_request_first(req, uptodate, nsectors))
-+ BUG();
-+ add_disk_randomness(req->rq_disk);
-+ blkdev_dequeue_request(req);
-+ end_that_request_last(req, uptodate);
-+}
-
- static int rwreq;
-
-@@ -385,11 +404,11 @@ static void do_viocd_request(request_que
-
- while ((rwreq == 0) && ((req = elv_next_request(q)) != NULL)) {
- if (!blk_fs_request(req))
-- end_request(req, 0);
-+ viocd_end_request(req, 0);
- else if (send_request(req) < 0) {
- printk(VIOCD_KERN_WARNING
- "unable to send message to OS/400!");
-- end_request(req, 0);
-+ viocd_end_request(req, 0);
- } else
- rwreq++;
- }
-@@ -601,9 +620,9 @@ return_complete:
- "with rc %d:0x%04X: %s\n",
- req, event->xRc,
- bevent->sub_result, err->msg);
-- end_request(req, 0);
-+ viocd_end_request(req, 0);
- } else
-- end_request(req, 1);
-+ viocd_end_request(req, 1);
-
- /* restart handling of incoming requests */
- spin_unlock_irqrestore(&viocd_reqlock, flags);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-pci-fixup_resource.patch new/patches.arch/ppc-pci-fixup_resource.patch
--- old/patches.arch/ppc-pci-fixup_resource.patch 2007-02-20 13:39:57.000000000 +0100
+++ new/patches.arch/ppc-pci-fixup_resource.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,86 +0,0 @@
-Subject: mark pci resources with start 0 as unassigned
-From: olh@suse.de
-References: 159235 - LTC22345
-Patch-mainline: yes
-
-libata calls pci_request_regions to claim bar 0 - 5
-bar 5 has base 0.
-Tested on a p630 in SMP mode with pata_sl82c105
-
-
- 00:03.1 IDE interface: Symphony Labs SL82c105 (rev 05) (prog-if 8f [Master SecP SecO PriP PriO])
- Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr+ Stepping- SERR+ FastB2B-
- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- resource[i].flags & IORESOURCE_IO
- && dev->bus->number == 0 && dev->devfn == 0x81)
- dev->resource[i].flags &= ~IORESOURCE_IO;
-+ if (dev->resource[i].start == 0 && dev->resource[i].end) {
-+ dev->resource[i].flags = 0;
-+ dev->resource[i].end = 0;
-+ }
- }
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-via-pmu-acpower.patch new/patches.arch/ppc-via-pmu-acpower.patch
--- old/patches.arch/ppc-via-pmu-acpower.patch 2007-02-20 13:39:57.000000000 +0100
+++ new/patches.arch/ppc-via-pmu-acpower.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-Date: Sat, 30 Sep 2006 17:25:30 +0200
-From: Olaf Hering
-Subject: [PATCH] AC power not detected if no battery present
-Patch-mainline: yes
-
-/proc/pmu/info contains AC Power: 0 when booting without battery.
-Force AC Power, it will be updated whenever the battery state changes.
-
-Signed-off-by: Olaf Hering
-
----
- drivers/macintosh/via-pmu.c | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
---- linux-2.6.19.orig/drivers/macintosh/via-pmu.c
-+++ linux-2.6.19/drivers/macintosh/via-pmu.c
-@@ -169,7 +169,7 @@ static int option_server_mode;
-
- int pmu_battery_count;
- int pmu_cur_battery;
--unsigned int pmu_power_flags;
-+unsigned int pmu_power_flags = PMU_PWR_AC_PRESENT;
- struct pmu_battery_info pmu_batteries[PMU_MAX_BATTERIES];
- static int query_batt_timer = BATTERY_POLLING_COUNT;
- static struct adb_request batt_req;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/stack-limit new/patches.arch/stack-limit
--- old/patches.arch/stack-limit 2005-02-23 17:05:40.000000000 +0100
+++ new/patches.arch/stack-limit 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-Subject: Remove stack limit
-From: schwab@suse.de
-
-Breaks pthreads.
-
---- linux-2.6.10/include/asm-ia64/resource.h.~1~ 2005-02-23 16:56:58.975354640 +0100
-+++ linux-2.6.10/include/asm-ia64/resource.h 2005-02-23 16:57:41.204854138 +0100
-@@ -2,7 +2,6 @@
- #define _ASM_IA64_RESOURCE_H
-
- #include
--#define _STK_LIM_MAX DEFAULT_USER_STACK_SIZE
- #include
-
- #endif /* _ASM_IA64_RESOURCE_H */
++++++ patches.drivers.tar.bz2 ++++++
++++ 5536 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_fan-problem-fix.patch new/patches.fixes/acpi_fan-problem-fix.patch
--- old/patches.fixes/acpi_fan-problem-fix.patch 2007-03-11 19:29:16.000000000 +0100
+++ new/patches.fixes/acpi_fan-problem-fix.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,100 +0,0 @@
-From: Konstantin Karasyov
-Subject: fix fans on HP laptops
-Patch-mainline: not yet
-References: http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8
-
-Signed-off-by: Thomas Renninger
-
-
-
----
- drivers/acpi/bus.c | 15 +++++++--------
- drivers/acpi/power.c | 4 ++++
- drivers/acpi/thermal.c | 28 ++++++++++++++++------------
- 3 files changed, 27 insertions(+), 20 deletions(-)
-
---- linux-2.6.20.orig/drivers/acpi/bus.c
-+++ linux-2.6.20/drivers/acpi/bus.c
-@@ -202,15 +202,14 @@ int acpi_bus_set_power(acpi_handle handl
- * Get device's current power state if it's unknown
- * This means device power state isn't initialized or previous setting failed
- */
-- if (!device->flags.force_power_state) {
-- if (device->power.state == ACPI_STATE_UNKNOWN)
-- acpi_bus_get_power(device->handle, &device->power.state);
-- if (state == device->power.state) {
-- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
-- state));
-- return 0;
-- }
-+ if ((device->power.state == ACPI_STATE_UNKNOWN) || device->flags.force_power_state)
-+ acpi_bus_get_power(device->handle, &device->power.state);
-+ if ((state == device->power.state) && !device->flags.force_power_state) {
-+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
-+ state));
-+ return 0;
- }
-+
- if (!device->power.states[state].flags.valid) {
- printk(KERN_WARNING PREFIX "Device does not support D%d\n", state);
- return -ENODEV;
---- linux-2.6.20.orig/drivers/acpi/power.c
-+++ linux-2.6.20/drivers/acpi/power.c
-@@ -412,6 +412,10 @@ int acpi_power_transition(struct acpi_de
- goto end;
- }
-
-+ if (device->power.state == state) {
-+ goto end;
-+ }
-+
- /*
- * Then we dereference all power resources used in the current list.
- */
---- linux-2.6.20.orig/drivers/acpi/thermal.c
-+++ linux-2.6.20/drivers/acpi/thermal.c
-@@ -1356,28 +1356,32 @@ static int acpi_thermal_remove(struct ac
- static int acpi_thermal_resume(struct acpi_device *device, int state)
- {
- struct acpi_thermal *tz = NULL;
-- int i;
-+ int i, j, power_state, result;
-+
-
- if (!device || !acpi_driver_data(device))
- return -EINVAL;
-
- tz = acpi_driver_data(device);
-
-- acpi_thermal_get_temperature(tz);
--
- for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
-- if (tz->trips.active[i].flags.valid) {
-- tz->temperature = tz->trips.active[i].temperature;
-- tz->trips.active[i].flags.enabled = 0;
--
-- acpi_thermal_active(tz);
--
-- tz->state.active |= tz->trips.active[i].flags.enabled;
-- tz->state.active_index = i;
-+ if (!(&tz->trips.active[i]))
-+ break;
-+ if (!tz->trips.active[i].flags.valid)
-+ break;
-+ tz->trips.active[i].flags.enabled = 1;
-+ for (j = 0; j < tz->trips.active[i].devices.count; j++) {
-+ result = acpi_bus_get_power(tz->trips.active[i].devices.
-+ handles[j], &power_state);
-+ if (result || (power_state != ACPI_STATE_D0)) {
-+ tz->trips.active[i].flags.enabled = 0;
-+ break;
-+ }
- }
-+ tz->state.active |= tz->trips.active[i].flags.enabled;
- }
-
-- acpi_thermal_check(tz);
-+ acpi_thermal_check(tz);
-
- return AE_OK;
- }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi-power-resources-resume-fix-2.patch new/patches.fixes/acpi-power-resources-resume-fix-2.patch
--- old/patches.fixes/acpi-power-resources-resume-fix-2.patch 2007-03-11 19:29:16.000000000 +0100
+++ new/patches.fixes/acpi-power-resources-resume-fix-2.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,313 +0,0 @@
-From: Konstantin Karasyov
-Subject: fix fans on HP laptops
-Patch-mainline: not yet
-References: http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52
-
-Signed-off-by: Thomas Renninger
-
-This patch belongs to acpi_fan-problem-fix.patch and
-acpi_force-fan-active.patch.
-With those patches applied and psmouse/serio fixups on shutdown and suspend
-ACPI should run reliable.
-
----
- drivers/acpi/power.c | 145 +++++++++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 124 insertions(+), 21 deletions(-)
-
---- linux-2.6.20.orig/drivers/acpi/power.c
-+++ linux-2.6.20/drivers/acpi/power.c
-@@ -57,6 +57,7 @@ ACPI_MODULE_NAME("acpi_power")
- #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
- static int acpi_power_add(struct acpi_device *device);
- static int acpi_power_remove(struct acpi_device *device, int type);
-+static int acpi_power_resume(struct acpi_device *device, int state);
- static int acpi_power_open_fs(struct inode *inode, struct file *file);
-
- static struct acpi_driver acpi_power_driver = {
-@@ -66,16 +67,23 @@ static struct acpi_driver acpi_power_dri
- .ops = {
- .add = acpi_power_add,
- .remove = acpi_power_remove,
-+ .resume = acpi_power_resume,
- },
- };
-
-+struct acpi_power_reference {
-+ struct list_head node;
-+ struct acpi_device *device;
-+};
-+
- struct acpi_power_resource {
- struct acpi_device * device;
- acpi_bus_id name;
- u32 system_level;
- u32 order;
- int state;
-- int references;
-+ struct mutex resource_lock;
-+ struct list_head reference;
- };
-
- static struct list_head acpi_power_resource_list;
-@@ -171,22 +179,46 @@ static int acpi_power_get_list_state(str
- return result;
- }
-
--static int acpi_power_on(acpi_handle handle)
-+static int acpi_power_on(acpi_handle handle, struct acpi_device *dev)
- {
- int result = 0;
-+ int found = 0;
- acpi_status status = AE_OK;
-- struct acpi_device *device = NULL;
- struct acpi_power_resource *resource = NULL;
-+ struct list_head *node, *next;
-+ struct acpi_power_reference *ref;
-
-
- result = acpi_power_get_context(handle, &resource);
- if (result)
- return result;
-
-- resource->references++;
-+ mutex_lock(&resource->resource_lock);
-+ list_for_each_safe(node, next, &resource->reference) {
-+ ref = container_of(node, struct acpi_power_reference, node);
-+ if (dev->handle == ref->device->handle) {
-+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] already referenced by resource [%s]\n",
-+ dev->pnp.bus_id, resource->name));
-+ found = 1;
-+ break;
-+ }
-+ }
-
-- if ((resource->references > 1)
-- || (resource->state == ACPI_POWER_RESOURCE_STATE_ON)) {
-+ if (!found) {
-+ ref = kmalloc(sizeof (struct acpi_power_reference), GFP_ATOMIC);
-+ if (!ref) {
-+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "kmalloc() failed\n"));
-+ mutex_unlock(&resource->resource_lock);
-+ return -ENOMEM;
-+ }
-+ list_add_tail(&ref->node, &resource->reference);
-+ ref->device = dev;
-+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] added to resource [%s] references\n",
-+ dev->pnp.bus_id, resource->name));
-+ }
-+ mutex_unlock(&resource->resource_lock);
-+
-+ if (resource->state == ACPI_POWER_RESOURCE_STATE_ON) {
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already on\n",
- resource->name));
- return 0;
-@@ -203,38 +235,48 @@ static int acpi_power_on(acpi_handle han
- return -ENOEXEC;
-
- /* Update the power resource's _device_ power state */
-- device = resource->device;
- resource->device->power.state = ACPI_STATE_D0;
-
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned on\n",
- resource->name));
--
- return 0;
- }
-
--static int acpi_power_off_device(acpi_handle handle)
-+static int acpi_power_off_device(acpi_handle handle, struct acpi_device *dev)
- {
- int result = 0;
- acpi_status status = AE_OK;
- struct acpi_power_resource *resource = NULL;
-+ struct list_head *node, *next;
-+ struct acpi_power_reference *ref;
-
- result = acpi_power_get_context(handle, &resource);
- if (result)
- return result;
-
-- if (resource->references)
-- resource->references--;
-+ mutex_lock(&resource->resource_lock);
-+ list_for_each_safe(node, next, &resource->reference) {
-+ ref = container_of(node, struct acpi_power_reference, node);
-+ if (dev->handle == ref->device->handle) {
-+ list_del(&ref->node);
-+ kfree(ref);
-+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] removed from resource [%s] references\n",
-+ dev->pnp.bus_id, resource->name));
-+ break;
-+ }
-+ }
-
-- if (resource->references) {
-- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-- "Resource [%s] is still in use, dereferencing\n",
-- resource->device->pnp.bus_id));
-+ if (!list_empty(&resource->reference)) {
-+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Cannot turn resource [%s] off - resource is in use\n",
-+ resource->name));
-+ mutex_unlock(&resource->resource_lock);
- return 0;
- }
-+ mutex_unlock(&resource->resource_lock);
-
- if (resource->state == ACPI_POWER_RESOURCE_STATE_OFF) {
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already off\n",
-- resource->device->pnp.bus_id));
-+ resource->name));
- return 0;
- }
-
-@@ -276,7 +318,7 @@ int acpi_enable_wakeup_device_power(stru
- arg.integer.value = 1;
- /* Open power resource */
- for (i = 0; i < dev->wakeup.resources.count; i++) {
-- ret = acpi_power_on(dev->wakeup.resources.handles[i]);
-+ ret = acpi_power_on(dev->wakeup.resources.handles[i], dev);
- if (ret) {
- printk(KERN_ERR PREFIX "Transition power state\n");
- dev->wakeup.flags.valid = 0;
-@@ -323,7 +365,7 @@ int acpi_disable_wakeup_device_power(str
-
- /* Close power resource */
- for (i = 0; i < dev->wakeup.resources.count; i++) {
-- ret = acpi_power_off_device(dev->wakeup.resources.handles[i]);
-+ ret = acpi_power_off_device(dev->wakeup.resources.handles[i], dev);
- if (ret) {
- printk(KERN_ERR PREFIX "Transition power state\n");
- dev->wakeup.flags.valid = 0;
-@@ -407,7 +449,7 @@ int acpi_power_transition(struct acpi_de
- * (e.g. so the device doesn't lose power while transitioning).
- */
- for (i = 0; i < tl->count; i++) {
-- result = acpi_power_on(tl->handles[i]);
-+ result = acpi_power_on(tl->handles[i], device);
- if (result)
- goto end;
- }
-@@ -420,7 +462,7 @@ int acpi_power_transition(struct acpi_de
- * Then we dereference all power resources used in the current list.
- */
- for (i = 0; i < cl->count; i++) {
-- result = acpi_power_off_device(cl->handles[i]);
-+ result = acpi_power_off_device(cl->handles[i], device);
- if (result)
- goto end;
- }
-@@ -443,7 +485,11 @@ static struct proc_dir_entry *acpi_power
-
- static int acpi_power_seq_show(struct seq_file *seq, void *offset)
- {
-+ int count = 0;
-+ int result = 0;
- struct acpi_power_resource *resource = NULL;
-+ struct list_head *node, *next;
-+ struct acpi_power_reference *ref;
-
-
- resource = seq->private;
-@@ -451,6 +497,10 @@ static int acpi_power_seq_show(struct se
- if (!resource)
- goto end;
-
-+ result = acpi_power_get_state(resource);
-+ if (result)
-+ goto end;
-+
- seq_puts(seq, "state: ");
- switch (resource->state) {
- case ACPI_POWER_RESOURCE_STATE_ON:
-@@ -464,11 +514,18 @@ static int acpi_power_seq_show(struct se
- break;
- }
-
-+ mutex_lock(&resource->resource_lock);
-+ list_for_each_safe(node, next, &resource->reference) {
-+ ref = container_of(node, struct acpi_power_reference, node);
-+ count++;
-+ }
-+ mutex_unlock(&resource->resource_lock);
-+
- seq_printf(seq, "system level: S%d\n"
- "order: %d\n"
- "reference count: %d\n",
- resource->system_level,
-- resource->order, resource->references);
-+ resource->order, count);
-
- end:
- return 0;
-@@ -541,6 +598,8 @@ static int acpi_power_add(struct acpi_de
- return -ENOMEM;
-
- resource->device = device;
-+ mutex_init(&resource->resource_lock);
-+ INIT_LIST_HEAD(&resource->reference);
- strcpy(resource->name, device->pnp.bus_id);
- strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
- strcpy(acpi_device_class(device), ACPI_POWER_CLASS);
-@@ -588,6 +647,7 @@ static int acpi_power_add(struct acpi_de
- static int acpi_power_remove(struct acpi_device *device, int type)
- {
- struct acpi_power_resource *resource = NULL;
-+ struct list_head *node, *next;
-
-
- if (!device || !acpi_driver_data(device))
-@@ -597,11 +657,54 @@ static int acpi_power_remove(struct acpi
-
- acpi_power_remove_fs(device);
-
-+ mutex_lock(&resource->resource_lock);
-+ list_for_each_safe(node, next, &resource->reference) {
-+ struct acpi_power_reference *ref = container_of(node, struct acpi_power_reference, node);
-+ list_del(&ref->node);
-+ kfree(ref);
-+ }
-+ mutex_unlock(&resource->resource_lock);
-+
- kfree(resource);
-
- return 0;
- }
-
-+static int acpi_power_resume(struct acpi_device *device, int state)
-+{
-+ int result = 0;
-+ struct acpi_power_resource *resource = NULL;
-+ struct acpi_power_reference *ref;
-+
-+ if (!device || !acpi_driver_data(device))
-+ return -EINVAL;
-+
-+ resource = (struct acpi_power_resource *)acpi_driver_data(device);
-+
-+ result = acpi_power_get_state(resource);
-+ if (result)
-+ return result;
-+
-+ mutex_lock(&resource->resource_lock);
-+ if ((resource->state == ACPI_POWER_RESOURCE_STATE_ON) &&
-+ list_empty(&resource->reference)) {
-+ mutex_unlock(&resource->resource_lock);
-+ result = acpi_power_off_device(device->handle, NULL);
-+ return result;
-+ }
-+
-+ if ((resource->state == ACPI_POWER_RESOURCE_STATE_OFF) &&
-+ !list_empty(&resource->reference)) {
-+ ref = container_of(resource->reference.next, struct acpi_power_reference, node);
-+ mutex_unlock(&resource->resource_lock);
-+ result = acpi_power_on(device->handle, ref->device);
-+ return result;
-+ }
-+
-+ mutex_unlock(&resource->resource_lock);
-+ return 0;
-+}
-+
- static int __init acpi_power_init(void)
- {
- int result = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/cpufreq_speedstep_acpi_nodefault.patch new/patches.fixes/cpufreq_speedstep_acpi_nodefault.patch
--- old/patches.fixes/cpufreq_speedstep_acpi_nodefault.patch 2007-02-16 00:32:25.000000000 +0100
+++ new/patches.fixes/cpufreq_speedstep_acpi_nodefault.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
- arch/i386/kernel/cpu/cpufreq/Kconfig | 1 -
- arch/x86_64/kernel/cpufreq/Kconfig | 1 -
- 2 files changed, 2 deletions(-)
-
-Index: linux-2.6.20/arch/x86_64/kernel/cpufreq/Kconfig
-===================================================================
---- linux-2.6.20.orig/arch/x86_64/kernel/cpufreq/Kconfig
-+++ linux-2.6.20/arch/x86_64/kernel/cpufreq/Kconfig
-@@ -45,7 +45,6 @@ config X86_SPEEDSTEP_CENTRINO
- config X86_SPEEDSTEP_CENTRINO_ACPI
- bool
- depends on X86_SPEEDSTEP_CENTRINO
-- default y
-
- config X86_ACPI_CPUFREQ
- tristate "ACPI Processor P-States driver"
-Index: linux-2.6.20/arch/i386/kernel/cpu/cpufreq/Kconfig
-===================================================================
---- linux-2.6.20.orig/arch/i386/kernel/cpu/cpufreq/Kconfig
-+++ linux-2.6.20/arch/i386/kernel/cpu/cpufreq/Kconfig
-@@ -125,7 +125,6 @@ config X86_SPEEDSTEP_CENTRINO_ACPI
- bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
- depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
- depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
-- default y
- help
- This is deprecated and this functionality is now merged into
- acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
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 2007-01-13 11:00:22.000000000 +0100
+++ new/patches.fixes/ignore-aix-disk-label.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-Subject: ignore partition table on disks with AIX label
-From: olh@suse.de
-References: 175995
-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
-the first block, and the kernel recognizes 3 small (and overlapping) partitions.
-But they are not usable. Maybe the firmware uses it to find the bootloader
-for AIX, but AIX boots also if the first block is cleared.
-
-This is the content of the partition table:
- # dd if=/dev/sdb count=$(( 4 * 16 )) bs=1 skip=$(( 0x1be )) | xxd
-0000000: 0000 0000 0000 0000 0000 0000 0000 0000 ................
-0000010: 80ff ffff 41ff ffff 1b11 0000 381b 0000 ....A.......8...
-0000020: 00ff ffff 41ff ffff 0211 0000 1900 0000 ....A...........
-0000030: 80ff ffff 41ff ffff 1b11 0000 381b 0000 ....A.......8...
-
-
-Handle the whole disk as empty disk.
-This fixes also YaST who compares the output from parted (and formerly fdisk)
-with /proc/partitions. fdisk recognizes the AIX label since a long time,
-SuSE has a patch for parted to handle the disk label as unknown.
-
-dmesg will look like this:
- sda: [AIX] unknown partition table
-
-Tested on an IBM B50 with AIX V4.3.3.
-
-Signed-off-by: Olaf Hering
-
----
- fs/partitions/msdos.c | 20 +++++++++++++++-----
- include/linux/genhd.h | 2 ++
- 2 files changed, 17 insertions(+), 5 deletions(-)
-
---- linux-2.6.19.orig/fs/partitions/msdos.c
-+++ linux-2.6.19/fs/partitions/msdos.c
-@@ -63,15 +63,25 @@ msdos_magic_present(unsigned char *p)
- #define AIX_LABEL_MAGIC4 0xC1
- static int aix_magic_present(unsigned char *p, struct block_device *bdev)
- {
-+ struct partition *pt = (struct partition *) (p + 0x1be);
- Sector sect;
- unsigned char *d;
-- int ret = 0;
-+ int slot, ret = 0;
-
-- if (p[0] != AIX_LABEL_MAGIC1 &&
-- p[1] != AIX_LABEL_MAGIC2 &&
-- p[2] != AIX_LABEL_MAGIC3 &&
-- p[3] != AIX_LABEL_MAGIC4)
-+ if (!(p[0] == AIX_LABEL_MAGIC1 &&
-+ p[1] == AIX_LABEL_MAGIC2 &&
-+ p[2] == AIX_LABEL_MAGIC3 &&
-+ p[3] == AIX_LABEL_MAGIC4))
- return 0;
-+ /* Assume the partition table is valid if Linux partitions exists */
-+ for (slot = 1; slot <= 4; slot++, pt++) {
-+ if (pt->sys_ind == LINUX_SWAP_PARTITION ||
-+ pt->sys_ind == LINUX_RAID_PARTITION ||
-+ pt->sys_ind == LINUX_DATA_PARTITION ||
-+ pt->sys_ind == LINUX_LVM_PARTITION ||
-+ is_extended_partition(pt))
-+ return 0;
-+ }
- d = read_dev_sector(bdev, 7, §);
- if (d) {
- if (d[0] == '_' && d[1] == 'L' && d[2] == 'V' && d[3] == 'M')
---- linux-2.6.19.orig/include/linux/genhd.h
-+++ linux-2.6.19/include/linux/genhd.h
-@@ -21,6 +21,8 @@ enum {
- WIN98_EXTENDED_PARTITION = 0x0f,
-
- LINUX_SWAP_PARTITION = 0x82,
-+ LINUX_DATA_PARTITION = 0x83,
-+ LINUX_LVM_PARTITION = 0x8e,
- LINUX_RAID_PARTITION = 0xfd, /* autodetect RAID partition */
-
- SOLARIS_X86_PARTITION = LINUX_SWAP_PARTITION,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/libata-ata_piix-acer-aspire-fix new/patches.fixes/libata-ata_piix-acer-aspire-fix
--- old/patches.fixes/libata-ata_piix-acer-aspire-fix 2007-03-11 19:29:16.000000000 +0100
+++ new/patches.fixes/libata-ata_piix-acer-aspire-fix 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-From: jakub007@go2.pl
-Subject: HDD on Acer Aspire 3682 WLMi limited to UDMA33
-References: 227477
-Patch-mainline: yes
-
-In Acer Aspire hdd is connected to ICH7 via 40c cable, however it is
-short cable and it is UDMA66 capable.
-
-Signed-off-by: Tejun Heo
-Signed-off-by: Hannes Reinecke
-
----
- drivers/ata/ata_piix.c | 1 +
- 1 files changed, 1 insertion(+)
-
---- linux-2.6.20.orig/drivers/ata/ata_piix.c
-+++ linux-2.6.20/drivers/ata/ata_piix.c
-@@ -573,6 +573,7 @@ struct ich_laptop {
- static const struct ich_laptop ich_laptop[] = {
- /* devid, subvendor, subdev */
- { 0x27DF, 0x0005, 0x0280 }, /* ICH7 on Acer 5602WLMi */
-+ { 0x27DF, 0x1025, 0x0110 }, /* ICH7 on Acer 3682WLMi */
- /* end marker */
- { 0, }
- };
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/libata-pata_sis-udma66-fix new/patches.fixes/libata-pata_sis-udma66-fix
--- old/patches.fixes/libata-pata_sis-udma66-fix 2007-02-20 13:39:57.000000000 +0100
+++ new/patches.fixes/libata-pata_sis-udma66-fix 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-From: jakub007@go2.pl
-Subject: HDD on ASUS A6K limited to UDMA33
-References: 227480
-Patch-mainline: yes
-
-In ASUS A6K/A6U hdd is connected to SiS 96x via 40c cable, however it
-is short cable and is UDMA66 capable.
-
-Signed-off-by: Tejun Heo
-Signed-off-by: Hannes Reinecke
-
-diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
-index c434c4e..d9486fc 100644
---- a/drivers/ata/pata_sis.c
-+++ b/drivers/ata/pata_sis.c
-@@ -43,6 +43,34 @@ struct sis_chipset {
- up code later */
- };
-
-+struct sis_laptop {
-+ u16 device;
-+ u16 subvendor;
-+ u16 subdevice;
-+};
-+
-+static const struct sis_laptop sis_laptop[] = {
-+ /* devid, subvendor, subdev */
-+ { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */
-+ /* end marker */
-+ { 0, }
-+};
-+
-+static int sis_short_ata40(struct pci_dev *dev)
-+{
-+ const struct sis_laptop *lap = &sis_laptop[0];
-+
-+ while (lap->device) {
-+ if (lap->device == dev->device &&
-+ lap->subvendor == dev->subsystem_vendor &&
-+ lap->subdevice == dev->subsystem_device)
-+ return 1;
-+ lap++;
-+ }
-+
-+ return 0;
-+}
-+
- /**
- * sis_port_base - return PCI configuration base for dev
- * @adev: device
-@@ -79,7 +107,7 @@ static int sis_133_pre_reset(struct ata_port *ap)
-
- /* The top bit of this register is the cable detect bit */
- pci_read_config_word(pdev, 0x50 + 2 * ap->port_no, &tmp);
-- if (tmp & 0x8000)
-+ if ((tmp & 0x8000) && !sis_short_ata40(pdev))
- ap->cbl = ATA_CBL_PATA40;
- else
- ap->cbl = ATA_CBL_PATA80;
-@@ -127,7 +155,7 @@ static int sis_66_pre_reset(struct ata_port *ap)
- /* Older chips keep cable detect in bits 4/5 of reg 0x48 */
- pci_read_config_byte(pdev, 0x48, &tmp);
- tmp >>= ap->port_no;
-- if (tmp & 0x10)
-+ if ((tmp & 0x10) && !sis_short_ata40(pdev))
- ap->cbl = ATA_CBL_PATA40;
- else
- ap->cbl = ATA_CBL_PATA80;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/serio-cleanup-to-bus_2.patch new/patches.fixes/serio-cleanup-to-bus_2.patch
--- old/patches.fixes/serio-cleanup-to-bus_2.patch 2007-03-11 19:29:16.000000000 +0100
+++ new/patches.fixes/serio-cleanup-to-bus_2.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,228 +0,0 @@
-Subject: i8042 - let serio bus suspend ports
-
-Input: i8042 - let serio bus suspend ports
-
-Let serio subsystem take care of suspending the ports; concentrate
-on suspending/resuming the controller itself.
-
-Signed-off-by: Dmitry Torokhov
----
-
- drivers/input/serio/i8042.c | 56 ++++++++++++++++++++++----------------------
- drivers/input/serio/serio.c | 36 +++++++++++++++++++++++++++-
- include/linux/serio.h | 6 ----
- 3 files changed, 64 insertions(+), 34 deletions(-)
-
---- linux-2.6.20.orig/drivers/input/serio/i8042.c
-+++ linux-2.6.20/drivers/input/serio/i8042.c
-@@ -721,7 +721,7 @@ static int i8042_controller_init(void)
- if (~i8042_read_status() & I8042_STR_KEYLOCK) {
- if (i8042_unlock)
- i8042_ctr |= I8042_CTR_IGNKEYLOCK;
-- else
-+ else
- printk(KERN_WARNING "i8042.c: Warning: Keylock active.\n");
- }
- spin_unlock_irqrestore(&i8042_lock, flags);
-@@ -788,27 +788,6 @@ static void i8042_controller_reset(void)
-
-
- /*
-- * Here we try to reset everything back to a state in which the BIOS will be
-- * able to talk to the hardware when rebooting.
-- */
--
--static void i8042_controller_cleanup(void)
--{
-- int i;
--
--/*
-- * Reset anything that is connected to the ports.
-- */
--
-- for (i = 0; i < I8042_NUM_PORTS; i++)
-- if (i8042_ports[i].serio)
-- serio_cleanup(i8042_ports[i].serio);
--
-- i8042_controller_reset();
--}
--
--
--/*
- * i8042_panic_blink() will flash the keyboard LEDs and is called when
- * kernel panics. Flashing LEDs is useful for users running X who may
- * not see the console and will help distingushing panics from "real"
-@@ -853,13 +832,22 @@ static long i8042_panic_blink(long count
-
- #undef DELAY
-
-+#ifdef CONFIG_PM
- /*
-- * Here we try to restore the original BIOS settings
-+ * Here we try to restore the original BIOS settings. We only want to
-+ * do that once, when we really suspend, not when we taking memory
-+ * snapshot for swsusp (in this case we'll perform required cleanup
-+ * as part of shutdown process).
- */
-
- static int i8042_suspend(struct platform_device *dev, pm_message_t state)
- {
-- i8042_controller_cleanup();
-+ if (dev->dev.power.power_state.event != state.event) {
-+ if (state.event == PM_EVENT_SUSPEND)
-+ i8042_controller_reset();
-+
-+ dev->dev.power.power_state = state;
-+ }
-
- return 0;
- }
-@@ -873,6 +861,12 @@ static int i8042_resume(struct platform_
- {
- int error;
-
-+/*
-+ * Do not bother with restoring state if we haven't suspened yet
-+ */
-+ if (dev->dev.power.power_state.event == PM_EVENT_ON)
-+ return 0;
-+
- error = i8042_controller_check();
- if (error)
- return error;
-@@ -882,9 +876,12 @@ static int i8042_resume(struct platform_
- return error;
-
- /*
-- * Restore pre-resume CTR value and disable all ports
-+ * Restore original CTR value and disable all ports
- */
-
-+ i8042_ctr = i8042_initial_ctr;
-+ if (i8042_direct)
-+ i8042_ctr &= ~I8042_CTR_XLATE;
- i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS;
- i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT);
- if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
-@@ -905,8 +902,11 @@ static int i8042_resume(struct platform_
-
- i8042_interrupt(0, NULL);
-
-+ dev->dev.power.power_state = PMSG_ON;
-+
- return 0;
- }
-+#endif /* CONFIG_PM */
-
- /*
- * We need to reset the 8042 back to original mode on system shutdown,
-@@ -915,7 +915,7 @@ static int i8042_resume(struct platform_
-
- static void i8042_shutdown(struct platform_device *dev)
- {
-- i8042_controller_cleanup();
-+ i8042_controller_reset();
- }
-
- static int __devinit i8042_create_kbd_port(void)
-@@ -1150,9 +1150,11 @@ static struct platform_driver i8042_driv
- },
- .probe = i8042_probe,
- .remove = __devexit_p(i8042_remove),
-+ .shutdown = i8042_shutdown,
-+#ifdef CONFIG_PM
- .suspend = i8042_suspend,
- .resume = i8042_resume,
-- .shutdown = i8042_shutdown,
-+#endif
- };
-
- static int __init i8042_init(void)
---- linux-2.6.20.orig/drivers/input/serio/serio.c
-+++ linux-2.6.20/drivers/input/serio/serio.c
-@@ -778,6 +778,19 @@ static int serio_driver_remove(struct de
- return 0;
- }
-
-+static void serio_cleanup(struct serio *serio)
-+{
-+ if (serio->drv && serio->drv->cleanup)
-+ serio->drv->cleanup(serio);
-+}
-+
-+static void serio_shutdown(struct device *dev)
-+{
-+ struct serio *serio = to_serio_port(dev);
-+
-+ serio_cleanup(serio);
-+}
-+
- static void serio_attach_driver(struct serio_driver *drv)
- {
- int error;
-@@ -908,11 +921,25 @@ static int serio_uevent(struct device *d
-
- #endif /* CONFIG_HOTPLUG */
-
-+#ifdef CONFIG_PM
-+static int serio_suspend(struct device *dev, pm_message_t state)
-+{
-+ if (dev->power.power_state.event != state.event) {
-+ if (state.event == PM_EVENT_SUSPEND)
-+ serio_cleanup(to_serio_port(dev));
-+
-+ dev->power.power_state = state;
-+ }
-+
-+ return 0;
-+}
-+
- static int serio_resume(struct device *dev)
- {
- struct serio *serio = to_serio_port(dev);
-
-- if (serio_reconnect_driver(serio)) {
-+ if (dev->power.power_state.event != PM_EVENT_ON &&
-+ serio_reconnect_driver(serio)) {
- /*
- * Driver re-probing can take a while, so better let kseriod
- * deal with it.
-@@ -920,8 +947,11 @@ static int serio_resume(struct device *d
- serio_rescan(serio);
- }
-
-+ dev->power.power_state = PMSG_ON;
-+
- return 0;
- }
-+#endif /* CONFIG_PM */
-
- /* called from serio_driver->connect/disconnect methods under serio_mutex */
- int serio_open(struct serio *serio, struct serio_driver *drv)
-@@ -972,7 +1002,11 @@ static struct bus_type serio_bus = {
- .uevent = serio_uevent,
- .probe = serio_driver_probe,
- .remove = serio_driver_remove,
-+ .shutdown = serio_shutdown,
-+#ifdef CONFIG_PM
-+ .suspend = serio_suspend,
- .resume = serio_resume,
-+#endif
- };
-
- static int __init serio_init(void)
---- linux-2.6.20.orig/include/linux/serio.h
-+++ linux-2.6.20/include/linux/serio.h
-@@ -103,12 +103,6 @@ static inline void serio_drv_write_wakeu
- serio->drv->write_wakeup(serio);
- }
-
--static inline void serio_cleanup(struct serio *serio)
--{
-- if (serio->drv && serio->drv->cleanup)
-- serio->drv->cleanup(serio);
--}
--
- /*
- * Use the following functions to manipulate serio's per-port
- * driver-specific data.
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 768819 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
++++ 4546 lines of diff (skipped)
++++++ patches.xen.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/net-csum.patch new/patches.xen/net-csum.patch
--- old/patches.xen/net-csum.patch 2007-02-13 09:08:39.000000000 +0100
+++ new/patches.xen/net-csum.patch 2007-03-20 09:43:29.000000000 +0100
@@ -39,7 +39,7 @@
@@ -48,6 +48,10 @@ static int xfrm4_output_one(struct sk_bu
struct xfrm_state *x = dst->xfrm;
int err;
-
+
+ err = skb_checksum_setup(skb);
+ if (err)
+ goto error_nolock;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/softlockup-no-idle-hz.patch new/patches.xen/softlockup-no-idle-hz.patch
--- old/patches.xen/softlockup-no-idle-hz.patch 2007-02-12 10:12:22.000000000 +0100
+++ new/patches.xen/softlockup-no-idle-hz.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-Subject: xen3 softlockup - no-idle-hz interaction fix
-From: http://xenbits.xensource.com/xen-unstable.hg (tip 13816)
-Acked-by: jbeulich@novell.com
-
-Index: head-2007-02-08/include/linux/sched.h
-===================================================================
---- head-2007-02-08.orig/include/linux/sched.h 2007-02-04 19:44:54.000000000 +0100
-+++ head-2007-02-08/include/linux/sched.h 2007-02-08 11:10:02.000000000 +0100
-@@ -223,10 +223,15 @@ extern void update_process_times(int use
- extern void scheduler_tick(void);
-
- #ifdef CONFIG_DETECT_SOFTLOCKUP
-+extern unsigned long softlockup_get_next_event(void);
- extern void softlockup_tick(void);
- extern void spawn_softlockup_task(void);
- extern void touch_softlockup_watchdog(void);
- #else
-+static inline unsigned long softlockup_get_next_event(void)
-+{
-+ return MAX_JIFFY_OFFSET;
-+}
- static inline void softlockup_tick(void)
- {
- }
-Index: head-2007-02-08/kernel/softlockup.c
-===================================================================
---- head-2007-02-08.orig/kernel/softlockup.c 2007-02-04 19:44:54.000000000 +0100
-+++ head-2007-02-08/kernel/softlockup.c 2007-02-08 11:10:02.000000000 +0100
-@@ -40,6 +40,19 @@ void touch_softlockup_watchdog(void)
- }
- EXPORT_SYMBOL(touch_softlockup_watchdog);
-
-+unsigned long softlockup_get_next_event(void)
-+{
-+ int this_cpu = smp_processor_id();
-+ unsigned long touch_timestamp = per_cpu(touch_timestamp, this_cpu);
-+
-+ if (per_cpu(print_timestamp, this_cpu) == touch_timestamp ||
-+ did_panic ||
-+ !per_cpu(watchdog_task, this_cpu))
-+ return MAX_JIFFY_OFFSET;
-+
-+ return min_t(long, 0, touch_timestamp + HZ - jiffies);
-+}
-+
- /*
- * This callback runs from the timer interrupt, and checks
- * whether the watchdog thread has hung or not:
-Index: head-2007-02-08/kernel/timer.c
-===================================================================
---- head-2007-02-08.orig/kernel/timer.c 2007-02-04 19:44:54.000000000 +0100
-+++ head-2007-02-08/kernel/timer.c 2007-02-08 11:10:02.000000000 +0100
-@@ -616,7 +616,9 @@ unsigned long next_timer_interrupt(void)
- if (hr_expires < 3)
- return hr_expires + jiffies;
- }
-- hr_expires += jiffies;
-+ hr_expires = min_t(unsigned long,
-+ softlockup_get_next_event(),
-+ hr_expires) + jiffies;
-
- base = __get_cpu_var(tvec_bases);
- spin_lock(&base->lock);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-arch-i386.diff new/patches.xen/xen3-auto-arch-i386.diff
--- old/patches.xen/xen3-auto-arch-i386.diff 2007-03-11 19:29:17.000000000 +0100
+++ new/patches.xen/xen3-auto-arch-i386.diff 2007-03-20 09:43:29.000000000 +0100
@@ -458,14 +458,11 @@
--- linux-2.6.20.orig/include/asm-i386/apic.h
+++ linux-2.6.20/include/asm-i386/apic.h
-@@ -116,10 +116,12 @@ extern void enable_APIC_timer(void);
+@@ -116,7 +116,9 @@ extern void enable_APIC_timer(void);
extern void enable_NMI_through_LVT0 (void * dummy);
+#ifndef CONFIG_XEN
- void smp_send_timer_broadcast_ipi(void);
- void switch_APIC_timer_to_ipi(void *cpumask);
- void switch_ipi_to_APIC_timer(void *cpumask);
#define ARCH_APICTIMER_STOPS_ON_C3 1
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-arch-x86_64.diff new/patches.xen/xen3-auto-arch-x86_64.diff
--- old/patches.xen/xen3-auto-arch-x86_64.diff 2007-02-13 09:08:39.000000000 +0100
+++ new/patches.xen/xen3-auto-arch-x86_64.diff 2007-03-20 09:43:29.000000000 +0100
@@ -327,9 +327,9 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
@@ -56,3 +58,20 @@ quirks-y += ../../i386/kernel/quirks.o
- i8237-y += ../../i386/kernel/i8237.o
msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../i386/kernel/msr.o
alternative-y += ../../i386/kernel/alternative.o
+ pcspeaker-y += ../../i386/kernel/pcspeaker.o
+
+ifdef CONFIG_XEN
+time-y += ../../i386/kernel/time-xen.o
@@ -451,9 +451,9 @@
irq-y += ../../i386/pci/irq.o
common-y += ../../i386/pci/common.o
@@ -24,3 +29,10 @@ fixup-y += ../../i386/pci/fixup.o
- i386-y += ../../i386/pci/i386.o
init-y += ../../i386/pci/init.o
early-y += ../../i386/pci/early.o
+ mmconfig-shared-y += ../../i386/pci/mmconfig-shared.o
+
+ifdef CONFIG_XEN
+irq-y := ../../i386/pci/irq-xen.o
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-common.diff new/patches.xen/xen3-auto-common.diff
--- old/patches.xen/xen3-auto-common.diff 2007-02-13 09:08:39.000000000 +0100
+++ new/patches.xen/xen3-auto-common.diff 2007-03-20 09:43:29.000000000 +0100
@@ -2067,12 +2067,14 @@
===================================================================
--- head-2007-02-08.orig/mm/memory.c 2007-02-08 09:55:09.000000000 +0100
+++ head-2007-02-08/mm/memory.c 2007-02-08 12:02:16.000000000 +0100
-@@ -404,7 +404,8 @@ struct page *vm_normal_page(struct vm_ar
+@@ -404,7 +404,10 @@ struct page *vm_normal_page(struct vm_ar
* and that the resulting page looks ok.
*/
if (unlikely(!pfn_valid(pfn))) {
- print_bad_pte(vma, pte, addr);
++#ifdef CONFIG_XEN
+ if (!(vma->vm_flags & VM_RESERVED))
++#endif
+ print_bad_pte(vma, pte, addr);
return NULL;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-xen-kconfig.diff new/patches.xen/xen3-auto-xen-kconfig.diff
--- old/patches.xen/xen3-auto-xen-kconfig.diff 2007-02-13 09:08:40.000000000 +0100
+++ new/patches.xen/xen3-auto-xen-kconfig.diff 2007-03-20 09:43:29.000000000 +0100
@@ -570,7 +570,7 @@
@@ -5,6 +5,7 @@ config PCI_MSI
bool "Message Signaled Interrupts (MSI and MSI-X)"
depends on PCI
- depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64
+ depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64 || SPARC64
+ depends on !XEN
help
This allows device drivers to enable MSI (Message Signaled
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-fixup-common new/patches.xen/xen3-fixup-common
--- old/patches.xen/xen3-fixup-common 2007-02-13 09:08:40.000000000 +0100
+++ new/patches.xen/xen3-fixup-common 2007-03-20 09:43:29.000000000 +0100
@@ -272,57 +272,3 @@
/* Do any necessary interrupt setup. Optional. */
int (*setup)(void);
/* Do any necessary interrupt shutdown. Optional. */
-Index: head-2007-02-08/include/linux/page-flags.h
-===================================================================
---- head-2007-02-08.orig/include/linux/page-flags.h 2007-02-08 13:10:01.000000000 +0100
-+++ head-2007-02-08/include/linux/page-flags.h 2007-02-08 13:21:30.000000000 +0100
-@@ -91,6 +91,8 @@
- #define PG_nosave_free 18 /* Used for system suspend/resume */
- #define PG_buddy 19 /* Page is free, on buddy lists */
-
-+#define PG_foreign 20 /* Page is owned by foreign allocator. */
-+
-
- #if (BITS_PER_LONG > 32)
- /*
-@@ -103,8 +105,6 @@
- #define PG_uncached 31 /* Page has been mapped as uncached */
- #endif
-
--#define PG_foreign 20 /* Page is owned by foreign allocator. */
--
- /*
- * Manipulation of page state flags
- */
-Index: head-2007-02-08/kernel/timer.c
-===================================================================
---- head-2007-02-08.orig/kernel/timer.c 2007-02-08 13:09:54.000000000 +0100
-+++ head-2007-02-08/kernel/timer.c 2007-02-08 13:18:10.000000000 +0100
-@@ -616,9 +616,13 @@ unsigned long next_timer_interrupt(void)
- if (hr_expires < 3)
- return hr_expires + jiffies;
- }
-+#ifndef CONFIG_XEN
-+ hr_expires += jiffies;
-+#else
- hr_expires = min_t(unsigned long,
- softlockup_get_next_event(),
- hr_expires) + jiffies;
-+#endif
-
- base = __get_cpu_var(tvec_bases);
- spin_lock(&base->lock);
-Index: head-2007-02-08/mm/memory.c
-===================================================================
---- head-2007-02-08.orig/mm/memory.c 2007-02-08 13:10:01.000000000 +0100
-+++ head-2007-02-08/mm/memory.c 2007-02-08 13:17:02.000000000 +0100
-@@ -404,7 +404,9 @@ struct page *vm_normal_page(struct vm_ar
- * and that the resulting page looks ok.
- */
- if (unlikely(!pfn_valid(pfn))) {
-+#ifdef CONFIG_XEN
- if (!(vma->vm_flags & VM_RESERVED))
-+#endif
- print_bad_pte(vma, pte, addr);
- return NULL;
- }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-patch-2.6.19 new/patches.xen/xen3-patch-2.6.19
--- old/patches.xen/xen3-patch-2.6.19 2007-03-11 19:29:17.000000000 +0100
+++ new/patches.xen/xen3-patch-2.6.19 2007-03-20 09:43:29.000000000 +0100
@@ -4487,7 +4487,7 @@
@@ -20,9 +20,9 @@ obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_X86_CPUID) += cpuid.o
- obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o
+ obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o tsc_sync.o
-obj-y += apic.o nmi.o
+obj-$(CONFIG_X86_LOCAL_APIC) += apic.o
obj-$(CONFIG_X86_XEN_GENAPIC) += genapic.o genapic_xen.o
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-patch-2.6.20 new/patches.xen/xen3-patch-2.6.20
--- old/patches.xen/xen3-patch-2.6.20 2007-03-11 19:29:17.000000000 +0100
+++ new/patches.xen/xen3-patch-2.6.20 2007-03-20 09:43:30.000000000 +0100
@@ -6902,8 +6902,8 @@
long eax;
int xds;
int xes;
-+ /* int xfs; */
-+ int xgs;
++ int xfs;
++ /* int xgs; */
long orig_eax;
long eip;
int xcs;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-patch-2.6.21 new/patches.xen/xen3-patch-2.6.21
--- old/patches.xen/xen3-patch-2.6.21 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.xen/xen3-patch-2.6.21 2007-03-18 23:01:01.000000000 +0100
@@ -0,0 +1,1104 @@
+---
+ arch/i386/kernel/acpi/boot-xen.c | 272 +++++++++++++-----------------
+ arch/i386/kernel/cpu/common-xen.c | 2
+ arch/i386/kernel/entry-xen.S | 8
+ arch/i386/kernel/io_apic-xen.c | 10 -
+ arch/i386/kernel/mpparse-xen.c | 4
+ arch/i386/kernel/process-xen.c | 8
+ arch/i386/kernel/time-xen.c | 4
+ arch/i386/mm/pageattr.c | 1
+ arch/x86_64/kernel/io_apic-xen.c | 10 -
+ drivers/xen/balloon/sysfs.c | 1
+ drivers/xen/core/evtchn.c | 4
+ drivers/xen/netfront/netfront.c | 37 +---
+ include/asm-i386/mach-xen/asm/pgalloc.h | 13 +
+ include/asm-i386/mach-xen/asm/processor.h | 2
+ include/asm-i386/mach-xen/asm/ptrace.h | 4
+ include/asm-i386/tsc.h | 4
+ 16 files changed, 179 insertions(+), 205 deletions(-)
+
+Index: linux-2.6.20/arch/i386/kernel/acpi/boot-xen.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/acpi/boot-xen.c
++++ linux-2.6.20/arch/i386/kernel/acpi/boot-xen.c
+@@ -25,6 +25,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -66,7 +67,7 @@ static inline int acpi_madt_oem_check(ch
+
+ #define BAD_MADT_ENTRY(entry, end) ( \
+ (!entry) || (unsigned long)entry + sizeof(*entry) > end || \
+- ((acpi_table_entry_header *)entry)->length < sizeof(*entry))
++ ((struct acpi_subtable_header *)entry)->length < sizeof(*entry))
+
+ #define PREFIX "ACPI: "
+
+@@ -79,7 +80,7 @@ int acpi_ioapic;
+ int acpi_strict;
+ EXPORT_SYMBOL(acpi_strict);
+
+-acpi_interrupt_flags acpi_sci_flags __initdata;
++u8 acpi_sci_flags __initdata;
+ int acpi_sci_override_gsi __initdata;
+ int acpi_skip_timer_override __initdata;
+ int acpi_use_timer_override __initdata;
+@@ -92,11 +93,6 @@ static u64 acpi_lapic_addr __initdata =
+ #warning ACPI uses CMPXCHG, i486 and later hardware
+ #endif
+
+-#define MAX_MADT_ENTRIES 256
+-u8 x86_acpiid_to_apicid[MAX_MADT_ENTRIES] =
+- {[0 ... MAX_MADT_ENTRIES - 1] = 0xff };
+-EXPORT_SYMBOL(x86_acpiid_to_apicid);
+-
+ /* --------------------------------------------------------------------------
+ Boot-time Configuration
+ -------------------------------------------------------------------------- */
+@@ -168,30 +164,26 @@ char *__acpi_map_table(unsigned long phy
+
+ #ifdef CONFIG_PCI_MMCONFIG
+ /* The physical address of the MMCONFIG aperture. Set from ACPI tables. */
+-struct acpi_table_mcfg_config *pci_mmcfg_config;
++struct acpi_mcfg_allocation *pci_mmcfg_config;
+ int pci_mmcfg_config_num;
+
+-int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
++int __init acpi_parse_mcfg(struct acpi_table_header *header)
+ {
+ struct acpi_table_mcfg *mcfg;
+ unsigned long i;
+ int config_size;
+
+- if (!phys_addr || !size)
++ if (!header)
+ return -EINVAL;
+
+- mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size);
+- if (!mcfg) {
+- printk(KERN_WARNING PREFIX "Unable to map MCFG\n");
+- return -ENODEV;
+- }
++ mcfg = (struct acpi_table_mcfg *)header;
+
+ /* how many config structures do we have */
+ pci_mmcfg_config_num = 0;
+- i = size - sizeof(struct acpi_table_mcfg);
+- while (i >= sizeof(struct acpi_table_mcfg_config)) {
++ i = header->length - sizeof(struct acpi_table_mcfg);
++ while (i >= sizeof(struct acpi_mcfg_allocation)) {
+ ++pci_mmcfg_config_num;
+- i -= sizeof(struct acpi_table_mcfg_config);
++ i -= sizeof(struct acpi_mcfg_allocation);
+ };
+ if (pci_mmcfg_config_num == 0) {
+ printk(KERN_ERR PREFIX "MMCONFIG has no entries\n");
+@@ -206,9 +198,9 @@ int __init acpi_parse_mcfg(unsigned long
+ return -ENOMEM;
+ }
+
+- memcpy(pci_mmcfg_config, &mcfg->config, config_size);
++ memcpy(pci_mmcfg_config, &mcfg[1], config_size);
+ for (i = 0; i < pci_mmcfg_config_num; ++i) {
+- if (mcfg->config[i].base_reserved) {
++ if (pci_mmcfg_config[i].address > 0xFFFFFFFF) {
+ printk(KERN_ERR PREFIX
+ "MMCONFIG not in low 4GB of memory\n");
+ kfree(pci_mmcfg_config);
+@@ -222,25 +214,25 @@ int __init acpi_parse_mcfg(unsigned long
+ #endif /* CONFIG_PCI_MMCONFIG */
+
+ #ifdef CONFIG_X86_LOCAL_APIC
+-static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
++static int __init acpi_parse_madt(struct acpi_table_header *table)
+ {
+ struct acpi_table_madt *madt = NULL;
+
+- if (!phys_addr || !size || !cpu_has_apic)
++ if (!cpu_has_apic)
+ return -EINVAL;
+
+- madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
++ madt = (struct acpi_table_madt *)table;
+ if (!madt) {
+ printk(KERN_WARNING PREFIX "Unable to map MADT\n");
+ return -ENODEV;
+ }
+
+ #ifndef CONFIG_XEN
+- if (madt->lapic_address) {
+- acpi_lapic_addr = (u64) madt->lapic_address;
++ if (madt->address) {
++ acpi_lapic_addr = (u64) madt->address;
+
+ printk(KERN_DEBUG PREFIX "Local APIC address 0x%08x\n",
+- madt->lapic_address);
++ madt->address);
+ }
+ #endif
+
+@@ -250,21 +242,17 @@ static int __init acpi_parse_madt(unsign
+ }
+
+ static int __init
+-acpi_parse_lapic(acpi_table_entry_header * header, const unsigned long end)
++acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end)
+ {
+- struct acpi_table_lapic *processor = NULL;
++ struct acpi_madt_local_apic *processor = NULL;
+
+- processor = (struct acpi_table_lapic *)header;
++ processor = (struct acpi_madt_local_apic *)header;
+
+ if (BAD_MADT_ENTRY(processor, end))
+ return -EINVAL;
+
+ acpi_table_print_madt_entry(header);
+
+- /* Record local apic id only when enabled */
+- if (processor->flags.enabled)
+- x86_acpiid_to_apicid[processor->acpi_id] = processor->id;
+-
+ /*
+ * We need to register disabled CPU as well to permit
+ * counting disabled CPUs. This allows us to size
+@@ -273,19 +261,19 @@ acpi_parse_lapic(acpi_table_entry_header
+ * when we use CPU hotplug.
+ */
+ mp_register_lapic(processor->id, /* APIC ID */
+- processor->flags.enabled); /* Enabled? */
++ processor->lapic_flags & ACPI_MADT_ENABLED); /* Enabled? */
+
+ return 0;
+ }
+
+ static int __init
+-acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header,
++acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,
+ const unsigned long end)
+ {
+ #ifndef CONFIG_XEN
+- struct acpi_table_lapic_addr_ovr *lapic_addr_ovr = NULL;
++ struct acpi_madt_local_apic_override *lapic_addr_ovr = NULL;
+
+- lapic_addr_ovr = (struct acpi_table_lapic_addr_ovr *)header;
++ lapic_addr_ovr = (struct acpi_madt_local_apic_override *)header;
+
+ if (BAD_MADT_ENTRY(lapic_addr_ovr, end))
+ return -EINVAL;
+@@ -297,11 +285,11 @@ acpi_parse_lapic_addr_ovr(acpi_table_ent
+ }
+
+ static int __init
+-acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)
++acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long end)
+ {
+- struct acpi_table_lapic_nmi *lapic_nmi = NULL;
++ struct acpi_madt_local_apic_nmi *lapic_nmi = NULL;
+
+- lapic_nmi = (struct acpi_table_lapic_nmi *)header;
++ lapic_nmi = (struct acpi_madt_local_apic_nmi *)header;
+
+ if (BAD_MADT_ENTRY(lapic_nmi, end))
+ return -EINVAL;
+@@ -319,11 +307,11 @@ acpi_parse_lapic_nmi(acpi_table_entry_he
+ #ifdef CONFIG_X86_IO_APIC
+
+ static int __init
+-acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
++acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
+ {
+- struct acpi_table_ioapic *ioapic = NULL;
++ struct acpi_madt_io_apic *ioapic = NULL;
+
+- ioapic = (struct acpi_table_ioapic *)header;
++ ioapic = (struct acpi_madt_io_apic *)header;
+
+ if (BAD_MADT_ENTRY(ioapic, end))
+ return -EINVAL;
+@@ -348,11 +336,11 @@ static void __init acpi_sci_ioapic_setup
+ polarity = 3;
+
+ /* Command-line over-ride via acpi_sci= */
+- if (acpi_sci_flags.trigger)
+- trigger = acpi_sci_flags.trigger;
++ if (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)
++ trigger = (acpi_sci_flags & ACPI_MADT_TRIGGER_MASK) >> 2;
+
+- if (acpi_sci_flags.polarity)
+- polarity = acpi_sci_flags.polarity;
++ if (acpi_sci_flags & ACPI_MADT_POLARITY_MASK)
++ polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;
+
+ /*
+ * mp_config_acpi_legacy_irqs() already setup IRQs < 16
+@@ -363,51 +351,52 @@ static void __init acpi_sci_ioapic_setup
+
+ /*
+ * stash over-ride to indicate we've been here
+- * and for later update of acpi_fadt
++ * and for later update of acpi_gbl_FADT
+ */
+ acpi_sci_override_gsi = gsi;
+ return;
+ }
+
+ static int __init
+-acpi_parse_int_src_ovr(acpi_table_entry_header * header,
++acpi_parse_int_src_ovr(struct acpi_subtable_header * header,
+ const unsigned long end)
+ {
+- struct acpi_table_int_src_ovr *intsrc = NULL;
++ struct acpi_madt_interrupt_override *intsrc = NULL;
+
+- intsrc = (struct acpi_table_int_src_ovr *)header;
++ intsrc = (struct acpi_madt_interrupt_override *)header;
+
+ if (BAD_MADT_ENTRY(intsrc, end))
+ return -EINVAL;
+
+ acpi_table_print_madt_entry(header);
+
+- if (intsrc->bus_irq == acpi_fadt.sci_int) {
++ if (intsrc->source_irq == acpi_gbl_FADT.sci_interrupt) {
+ acpi_sci_ioapic_setup(intsrc->global_irq,
+- intsrc->flags.polarity,
+- intsrc->flags.trigger);
++ intsrc->inti_flags & ACPI_MADT_POLARITY_MASK,
++ (intsrc->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2);
+ return 0;
+ }
+
+ if (acpi_skip_timer_override &&
+- intsrc->bus_irq == 0 && intsrc->global_irq == 2) {
++ intsrc->source_irq == 0 && intsrc->global_irq == 2) {
+ printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n");
+ return 0;
+ }
+
+- mp_override_legacy_irq(intsrc->bus_irq,
+- intsrc->flags.polarity,
+- intsrc->flags.trigger, intsrc->global_irq);
++ mp_override_legacy_irq(intsrc->source_irq,
++ intsrc->inti_flags & ACPI_MADT_POLARITY_MASK,
++ (intsrc->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2,
++ intsrc->global_irq);
+
+ return 0;
+ }
+
+ static int __init
+-acpi_parse_nmi_src(acpi_table_entry_header * header, const unsigned long end)
++acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end)
+ {
+- struct acpi_table_nmi_src *nmi_src = NULL;
++ struct acpi_madt_nmi_source *nmi_src = NULL;
+
+- nmi_src = (struct acpi_table_nmi_src *)header;
++ nmi_src = (struct acpi_madt_nmi_source *)header;
+
+ if (BAD_MADT_ENTRY(nmi_src, end))
+ return -EINVAL;
+@@ -423,7 +412,7 @@ acpi_parse_nmi_src(acpi_table_entry_head
+
+ /*
+ * acpi_pic_sci_set_trigger()
+- *
++ *
+ * use ELCR to set PIC-mode trigger type for SCI
+ *
+ * If a PIC-mode SCI is not recognized or gives spurious IRQ7's
+@@ -517,7 +506,7 @@ int acpi_map_lsapic(acpi_handle handle,
+ {
+ struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ union acpi_object *obj;
+- struct acpi_table_lapic *lapic;
++ struct acpi_madt_local_apic *lapic;
+ cpumask_t tmp_map, new_map;
+ u8 physid;
+ int cpu;
+@@ -535,10 +524,10 @@ int acpi_map_lsapic(acpi_handle handle,
+ return -EINVAL;
+ }
+
+- lapic = (struct acpi_table_lapic *)obj->buffer.pointer;
++ lapic = (struct acpi_madt_local_apic *)obj->buffer.pointer;
+
+- if ((lapic->header.type != ACPI_MADT_LAPIC) ||
+- (!lapic->flags.enabled)) {
++ if (lapic->header.type != ACPI_MADT_TYPE_LOCAL_APIC ||
++ !(lapic->lapic_flags & ACPI_MADT_ENABLED)) {
+ kfree(buffer.pointer);
+ return -EINVAL;
+ }
+@@ -550,7 +539,7 @@ int acpi_map_lsapic(acpi_handle handle,
+ buffer.pointer = NULL;
+
+ tmp_map = cpu_present_map;
+- mp_register_lapic(physid, lapic->flags.enabled);
++ mp_register_lapic(physid, lapic->lapic_flags & ACPI_MADT_ENABLED);
+
+ /*
+ * If mp_register_lapic successfully generates a new logical cpu
+@@ -572,14 +561,6 @@ EXPORT_SYMBOL(acpi_map_lsapic);
+
+ int acpi_unmap_lsapic(int cpu)
+ {
+- int i;
+-
+- for_each_possible_cpu(i) {
+- if (x86_acpiid_to_apicid[i] == x86_cpu_to_apicid[cpu]) {
+- x86_acpiid_to_apicid[i] = -1;
+- break;
+- }
+- }
+ x86_cpu_to_apicid[cpu] = -1;
+ cpu_clear(cpu, cpu_present_map);
+ num_processors--;
+@@ -626,42 +607,37 @@ acpi_scan_rsdp(unsigned long start, unsi
+ return 0;
+ }
+
+-static int __init acpi_parse_sbf(unsigned long phys_addr, unsigned long size)
++static int __init acpi_parse_sbf(struct acpi_table_header *table)
+ {
+- struct acpi_table_sbf *sb;
+-
+- if (!phys_addr || !size)
+- return -EINVAL;
++ struct acpi_table_boot *sb;
+
+- sb = (struct acpi_table_sbf *)__acpi_map_table(phys_addr, size);
++ sb = (struct acpi_table_boot *)table;
+ if (!sb) {
+ printk(KERN_WARNING PREFIX "Unable to map SBF\n");
+ return -ENODEV;
+ }
+
+- sbf_port = sb->sbf_cmos; /* Save CMOS port */
++ sbf_port = sb->cmos_index; /* Save CMOS port */
+
+ return 0;
+ }
+
+ #ifdef CONFIG_HPET_TIMER
++#include
+
+-static int __init acpi_parse_hpet(unsigned long phys, unsigned long size)
++static int __init acpi_parse_hpet(struct acpi_table_header *table)
+ {
+ struct acpi_table_hpet *hpet_tbl;
+ struct resource *hpet_res;
+ resource_size_t res_start;
+
+- if (!phys || !size)
+- return -EINVAL;
+-
+- hpet_tbl = (struct acpi_table_hpet *)__acpi_map_table(phys, size);
++ hpet_tbl = (struct acpi_table_hpet *)table;
+ if (!hpet_tbl) {
+ printk(KERN_WARNING PREFIX "Unable to map HPET\n");
+ return -ENODEV;
+ }
+
+- if (hpet_tbl->addr.space_id != ACPI_SPACE_MEM) {
++ if (hpet_tbl->address.space_id != ACPI_SPACE_MEM) {
+ printk(KERN_WARNING PREFIX "HPET timers must be located in "
+ "memory.\n");
+ return -1;
+@@ -674,29 +650,15 @@ static int __init acpi_parse_hpet(unsign
+ hpet_res->name = (void *)&hpet_res[1];
+ hpet_res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+ snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE,
+- "HPET %u", hpet_tbl->number);
++ "HPET %u", hpet_tbl->sequence);
+ hpet_res->end = (1 * 1024) - 1;
+ }
+
+-#ifdef CONFIG_X86_64
+- vxtime.hpet_address = hpet_tbl->addr.addrl |
+- ((long)hpet_tbl->addr.addrh << 32);
+-
++ hpet_address = hpet_tbl->address.address;
+ printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
+- hpet_tbl->id, vxtime.hpet_address);
+-
+- res_start = vxtime.hpet_address;
+-#else /* X86 */
+- {
+- extern unsigned long hpet_address;
+-
+- hpet_address = hpet_tbl->addr.addrl;
+- printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
+- hpet_tbl->id, hpet_address);
++ hpet_tbl->id, hpet_address);
+
+- res_start = hpet_address;
+- }
+-#endif /* X86 */
++ res_start = hpet_address;
+
+ if (hpet_res) {
+ hpet_res->start = res_start;
+@@ -710,46 +672,28 @@ static int __init acpi_parse_hpet(unsign
+ #define acpi_parse_hpet NULL
+ #endif
+
+-#ifdef CONFIG_X86_PM_TIMER
+-extern u32 pmtmr_ioport;
+-#endif
+-
+-static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
++static int __init acpi_parse_fadt(struct acpi_table_header *table)
+ {
+- struct fadt_descriptor *fadt = NULL;
+-
+- fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size);
+- if (!fadt) {
+- printk(KERN_WARNING PREFIX "Unable to map FADT\n");
+- return 0;
+- }
+- /* initialize sci_int early for INT_SRC_OVR MADT parsing */
+- acpi_fadt.sci_int = fadt->sci_int;
+-
+- /* initialize rev and apic_phys_dest_mode for x86_64 genapic */
+- acpi_fadt.revision = fadt->revision;
+- acpi_fadt.force_apic_physical_destination_mode =
+- fadt->force_apic_physical_destination_mode;
+
+ #if defined(CONFIG_X86_PM_TIMER) && !defined(CONFIG_XEN)
+ /* detect the location of the ACPI PM Timer */
+- if (fadt->revision >= FADT2_REVISION_ID) {
++ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) {
+ /* FADT rev. 2 */
+- if (fadt->xpm_tmr_blk.address_space_id !=
++ if (acpi_gbl_FADT.xpm_timer_block.space_id !=
+ ACPI_ADR_SPACE_SYSTEM_IO)
+ return 0;
+
+- pmtmr_ioport = fadt->xpm_tmr_blk.address;
++ pmtmr_ioport = acpi_gbl_FADT.xpm_timer_block.address;
+ /*
+ * "X" fields are optional extensions to the original V1.0
+ * fields, so we must selectively expand V1.0 fields if the
+ * corresponding X field is zero.
+ */
+ if (!pmtmr_ioport)
+- pmtmr_ioport = fadt->V1_pm_tmr_blk;
++ pmtmr_ioport = acpi_gbl_FADT.pm_timer_block;
+ } else {
+ /* FADT rev. 1 */
+- pmtmr_ioport = fadt->V1_pm_tmr_blk;
++ pmtmr_ioport = acpi_gbl_FADT.pm_timer_block;
+ }
+ if (pmtmr_ioport)
+ printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n",
+@@ -791,13 +735,13 @@ static int __init acpi_parse_madt_lapic_
+ if (!cpu_has_apic)
+ return -ENODEV;
+
+- /*
++ /*
+ * Note that the LAPIC address is obtained from the MADT (32-bit value)
+ * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
+ */
+
+ count =
+- acpi_table_parse_madt(ACPI_MADT_LAPIC_ADDR_OVR,
++ acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
+ acpi_parse_lapic_addr_ovr, 0);
+ if (count < 0) {
+ printk(KERN_ERR PREFIX
+@@ -809,7 +753,7 @@ static int __init acpi_parse_madt_lapic_
+ mp_register_lapic_address(acpi_lapic_addr);
+ #endif
+
+- count = acpi_table_parse_madt(ACPI_MADT_LAPIC, acpi_parse_lapic,
++ count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC, acpi_parse_lapic,
+ MAX_APICS);
+ if (!count) {
+ printk(KERN_ERR PREFIX "No LAPIC entries present\n");
+@@ -822,7 +766,7 @@ static int __init acpi_parse_madt_lapic_
+ }
+
+ count =
+- acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0);
++ acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI, acpi_parse_lapic_nmi, 0);
+ if (count < 0) {
+ printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
+ /* TBD: Cleanup to allow fallback to MPS */
+@@ -851,7 +795,7 @@ static int __init acpi_parse_madt_ioapic
+ return -ENODEV;
+ }
+
+- if (!cpu_has_apic)
++ if (!cpu_has_apic)
+ return -ENODEV;
+
+ /*
+@@ -864,7 +808,7 @@ static int __init acpi_parse_madt_ioapic
+ }
+
+ count =
+- acpi_table_parse_madt(ACPI_MADT_IOAPIC, acpi_parse_ioapic,
++ acpi_table_parse_madt(ACPI_MADT_TYPE_IO_APIC, acpi_parse_ioapic,
+ MAX_IO_APICS);
+ if (!count) {
+ printk(KERN_ERR PREFIX "No IOAPIC entries present\n");
+@@ -875,7 +819,7 @@ static int __init acpi_parse_madt_ioapic
+ }
+
+ count =
+- acpi_table_parse_madt(ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr,
++ acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr,
+ NR_IRQ_VECTORS);
+ if (count < 0) {
+ printk(KERN_ERR PREFIX
+@@ -889,13 +833,13 @@ static int __init acpi_parse_madt_ioapic
+ * pretend we got one so we can set the SCI flags.
+ */
+ if (!acpi_sci_override_gsi)
+- acpi_sci_ioapic_setup(acpi_fadt.sci_int, 0, 0);
++ acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0);
+
+ /* Fill in identity legacy mapings where no override */
+ mp_config_acpi_legacy_irqs();
+
+ count =
+- acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src,
++ acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE, acpi_parse_nmi_src,
+ NR_IRQ_VECTORS);
+ if (count < 0) {
+ printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
+@@ -915,10 +859,9 @@ static inline int acpi_parse_madt_ioapic
+ static void __init acpi_process_madt(void)
+ {
+ #ifdef CONFIG_X86_LOCAL_APIC
+- int count, error;
++ int error;
+
+- count = acpi_table_parse(ACPI_APIC, acpi_parse_madt);
+- if (count >= 1) {
++ if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {
+
+ /*
+ * Parse MADT LAPIC entries
+@@ -1138,7 +1081,28 @@ static struct dmi_system_id __initdata a
+ "ASUS A7V ACPI BIOS Revision 1007"),
+ },
+ },
+-
++ {
++ /*
++ * Latest BIOS for IBM 600E (1.16) has bad pcinum
++ * for LPC bridge, which is needed for the PCI
++ * interrupt links to work. DSDT fix is in bug 5966.
++ * 2645, 2646 model numbers are shared with 600/600E/600X
++ */
++ .callback = disable_acpi_irq,
++ .ident = "IBM Thinkpad 600 Series 2645",
++ .matches = {
++ DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
++ DMI_MATCH(DMI_BOARD_NAME, "2645"),
++ },
++ },
++ {
++ .callback = disable_acpi_irq,
++ .ident = "IBM Thinkpad 600 Series 2646",
++ .matches = {
++ DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
++ DMI_MATCH(DMI_BOARD_NAME, "2646"),
++ },
++ },
+ /*
+ * Boxes that need ACPI PCI IRQ routing and PCI scan disabled
+ */
+@@ -1204,7 +1168,7 @@ int __init acpi_boot_table_init(void)
+ if (acpi_disabled && !acpi_ht)
+ return 1;
+
+- /*
++ /*
+ * Initialize the ACPI boot-time table parser.
+ */
+ error = acpi_table_init();
+@@ -1213,7 +1177,7 @@ int __init acpi_boot_table_init(void)
+ return error;
+ }
+
+- acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
++ acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
+
+ /*
+ * blacklist may disable ACPI entirely
+@@ -1241,19 +1205,19 @@ int __init acpi_boot_init(void)
+ if (acpi_disabled && !acpi_ht)
+ return 1;
+
+- acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
++ acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
+
+ /*
+ * set sci_int and PM timer address
+ */
+- acpi_table_parse(ACPI_FADT, acpi_parse_fadt);
++ acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt);
+
+ /*
+ * Process the Multiple APIC Description Table (MADT), if present
+ */
+ acpi_process_madt();
+
+- acpi_table_parse(ACPI_HPET, acpi_parse_hpet);
++ acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet);
+
+ return 0;
+ }
+@@ -1324,13 +1288,17 @@ static int __init setup_acpi_sci(char *s
+ if (!s)
+ return -EINVAL;
+ if (!strcmp(s, "edge"))
+- acpi_sci_flags.trigger = 1;
++ acpi_sci_flags = ACPI_MADT_TRIGGER_EDGE |
++ (acpi_sci_flags & ~ACPI_MADT_TRIGGER_MASK);
+ else if (!strcmp(s, "level"))
+- acpi_sci_flags.trigger = 3;
++ acpi_sci_flags = ACPI_MADT_TRIGGER_LEVEL |
++ (acpi_sci_flags & ~ACPI_MADT_TRIGGER_MASK);
+ else if (!strcmp(s, "high"))
+- acpi_sci_flags.polarity = 1;
++ acpi_sci_flags = ACPI_MADT_POLARITY_ACTIVE_HIGH |
++ (acpi_sci_flags & ~ACPI_MADT_POLARITY_MASK);
+ else if (!strcmp(s, "low"))
+- acpi_sci_flags.polarity = 3;
++ acpi_sci_flags = ACPI_MADT_POLARITY_ACTIVE_LOW |
++ (acpi_sci_flags & ~ACPI_MADT_POLARITY_MASK);
+ else
+ return -EINVAL;
+ return 0;
+Index: linux-2.6.20/arch/i386/kernel/cpu/common-xen.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/cpu/common-xen.c
++++ linux-2.6.20/arch/i386/kernel/cpu/common-xen.c
+@@ -610,7 +610,7 @@ void __init early_cpu_init(void)
+ struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
+ {
+ memset(regs, 0, sizeof(struct pt_regs));
+- regs->xgs = __KERNEL_PDA;
++ regs->xfs = __KERNEL_PDA;
+ return regs;
+ }
+
+Index: linux-2.6.20/arch/i386/kernel/entry-xen.S
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/entry-xen.S
++++ linux-2.6.20/arch/i386/kernel/entry-xen.S
+@@ -352,11 +352,11 @@ sysenter_past_esp:
+ movl PT_OLDESP(%esp), %ecx
+ xorl %ebp,%ebp
+ TRACE_IRQS_ON
+-1: mov PT_GS(%esp), %gs
++1: mov PT_FS(%esp), %gs
+ ENABLE_INTERRUPTS_SYSEXIT
+ CFI_ENDPROC
+ .pushsection .fixup,"ax"
+-2: movl $0,PT_GS(%esp)
++2: movl $0,PT_FS(%esp)
+ jmp 1b
+ .section __ex_table,"a"
+ .align 4
+@@ -722,10 +722,10 @@ error_code:
+ popl %ecx
+ CFI_ADJUST_CFA_OFFSET -4
+ /*CFI_REGISTER es, ecx*/
+- movl PT_GS(%esp), %edi # get the function address
++ movl PT_FS(%esp), %edi # get the function address
+ movl PT_ORIG_EAX(%esp), %edx # get the error code
+ movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
+- mov %ecx, PT_GS(%esp)
++ mov %ecx, PT_FS(%esp)
+ /*CFI_REL_OFFSET gs, ES*/
+ movl $(__USER_DS), %ecx
+ movl %ecx, %ds
+Index: linux-2.6.20/arch/i386/kernel/io_apic-xen.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/io_apic-xen.c
++++ linux-2.6.20/arch/i386/kernel/io_apic-xen.c
+@@ -390,7 +390,7 @@ static void set_ioapic_affinity_irq(unsi
+ break;
+ entry = irq_2_pin + entry->next;
+ }
+- set_native_irq_info(irq, cpumask);
++ irq_desc[irq].affinity = cpumask;
+ spin_unlock_irqrestore(&ioapic_lock, flags);
+ }
+
+@@ -1386,7 +1386,7 @@ static void __init setup_IO_APIC_irqs(vo
+ }
+ spin_lock_irqsave(&ioapic_lock, flags);
+ __ioapic_write_entry(apic, pin, entry);
+- set_native_irq_info(irq, TARGET_CPUS);
++ irq_desc[irq].affinity = TARGET_CPUS;
+ spin_unlock_irqrestore(&ioapic_lock, flags);
+ }
+ }
+@@ -2646,7 +2646,7 @@ static void set_msi_irq_affinity(unsigne
+ msg.address_lo |= MSI_ADDR_DEST_ID(dest);
+
+ write_msi_msg(irq, &msg);
+- set_native_irq_info(irq, mask);
++ irq_desc[irq].affinity = mask;
+ }
+ #endif /* CONFIG_SMP */
+
+@@ -2723,7 +2723,7 @@ static void set_ht_irq_affinity(unsigned
+ dest = cpu_mask_to_apicid(mask);
+
+ target_ht_irq(irq, dest);
+- set_native_irq_info(irq, mask);
++ irq_desc[irq].affinity = mask;
+ }
+ #endif
+
+@@ -2931,7 +2931,7 @@ int io_apic_set_pci_routing (int ioapic,
+
+ spin_lock_irqsave(&ioapic_lock, flags);
+ __ioapic_write_entry(ioapic, pin, entry);
+- set_native_irq_info(irq, TARGET_CPUS);
++ irq_desc[irq].affinity = TARGET_CPUS;
+ spin_unlock_irqrestore(&ioapic_lock, flags);
+
+ return 0;
+Index: linux-2.6.20/arch/i386/kernel/mpparse-xen.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/mpparse-xen.c
++++ linux-2.6.20/arch/i386/kernel/mpparse-xen.c
+@@ -1085,7 +1085,7 @@ int mp_register_gsi(u32 gsi, int trigger
+ static int gsi_to_irq[MAX_GSI_NUM];
+
+ /* Don't set up the ACPI SCI because it's already set up */
+- if (acpi_fadt.sci_int == gsi)
++ if (acpi_gbl_FADT.sci_interrupt == gsi)
+ return gsi;
+
+ ioapic = mp_find_ioapic(gsi);
+@@ -1142,7 +1142,7 @@ int mp_register_gsi(u32 gsi, int trigger
+ /*
+ * Don't assign IRQ used by ACPI SCI
+ */
+- if (gsi == acpi_fadt.sci_int)
++ if (gsi == acpi_gbl_FADT.sci_interrupt)
+ gsi = pci_irq++;
+ gsi_to_irq[irq] = gsi;
+ } else {
+Index: linux-2.6.20/arch/i386/kernel/process-xen.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/process-xen.c
++++ linux-2.6.20/arch/i386/kernel/process-xen.c
+@@ -253,8 +253,8 @@ void show_regs(struct pt_regs * regs)
+ regs->eax,regs->ebx,regs->ecx,regs->edx);
+ printk("ESI: %08lx EDI: %08lx EBP: %08lx",
+ regs->esi, regs->edi, regs->ebp);
+- printk(" DS: %04x ES: %04x GS: %04x\n",
+- 0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xgs);
++ printk(" DS: %04x ES: %04x FS: %04x\n",
++ 0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xfs);
+
+ cr0 = read_cr0();
+ cr2 = read_cr2();
+@@ -285,7 +285,7 @@ int kernel_thread(int (*fn)(void *), voi
+
+ regs.xds = __USER_DS;
+ regs.xes = __USER_DS;
+- regs.xgs = __KERNEL_PDA;
++ regs.xfs = __KERNEL_PDA;
+ regs.orig_eax = -1;
+ regs.eip = (unsigned long) kernel_thread_helper;
+ regs.xcs = __KERNEL_CS | get_kernel_rpl();
+@@ -439,7 +439,7 @@ void dump_thread(struct pt_regs * regs,
+ dump->regs.ds = regs->xds;
+ dump->regs.es = regs->xes;
+ savesegment(fs,dump->regs.fs);
+- dump->regs.gs = regs->xgs;
++ dump->regs.gs = regs->xfs;
+ dump->regs.orig_eax = regs->orig_eax;
+ dump->regs.eip = regs->eip;
+ dump->regs.cs = regs->xcs;
+Index: linux-2.6.20/arch/i386/kernel/time-xen.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/time-xen.c
++++ linux-2.6.20/arch/i386/kernel/time-xen.c
+@@ -1132,7 +1132,7 @@ static struct clocksource clocksource_xe
+ .mask = CLOCKSOURCE_MASK(64),
+ .mult = 0, /* to be set */
+ .shift = 22,
+- .is_continuous = 1,
++ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
+ };
+
+ static int __init init_xen_clocksource(void)
+@@ -1180,7 +1180,7 @@ static ctl_table xen_table[] = {
+ };
+ static int __init xen_sysctl_init(void)
+ {
+- (void)register_sysctl_table(xen_table, 0);
++ (void)register_sysctl_table(xen_table);
+ return 0;
+ }
+ __initcall(xen_sysctl_init);
+Index: linux-2.6.20/arch/i386/mm/pageattr.c
+===================================================================
+--- linux-2.6.20.orig/arch/i386/mm/pageattr.c
++++ linux-2.6.20/arch/i386/mm/pageattr.c
+@@ -13,6 +13,7 @@
+ #include
+ #include
+ #include
++#include
+
+ static DEFINE_SPINLOCK(cpa_lock);
+ static struct list_head df_list = LIST_HEAD_INIT(df_list);
+Index: linux-2.6.20/arch/x86_64/kernel/io_apic-xen.c
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/kernel/io_apic-xen.c
++++ linux-2.6.20/arch/x86_64/kernel/io_apic-xen.c
+@@ -282,7 +282,7 @@ static void set_ioapic_affinity_irq(unsi
+
+ spin_lock_irqsave(&ioapic_lock, flags);
+ __target_IO_APIC_irq(irq, dest, vector);
+- set_native_irq_info(irq, mask);
++ irq_desc[irq].affinity = mask;
+ spin_unlock_irqrestore(&ioapic_lock, flags);
+ }
+ #endif
+@@ -815,7 +815,7 @@ static void __init setup_IO_APIC_irq(int
+ ioapic_write_entry(apic, pin, entry);
+
+ spin_lock_irqsave(&ioapic_lock, flags);
+- set_native_irq_info(irq, TARGET_CPUS);
++ irq_desc[irq].affinity = TARGET_CPUS;
+ spin_unlock_irqrestore(&ioapic_lock, flags);
+
+ }
+@@ -1914,7 +1914,7 @@ static void set_msi_irq_affinity(unsigne
+ msg.address_lo |= MSI_ADDR_DEST_ID(dest);
+
+ write_msi_msg(irq, &msg);
+- set_native_irq_info(irq, mask);
++ irq_desc[irq].affinity = mask;
+ }
+ #endif /* CONFIG_SMP */
+
+@@ -1995,7 +1995,7 @@ static void set_ht_irq_affinity(unsigned
+ dest = cpu_mask_to_apicid(tmp);
+
+ target_ht_irq(irq, dest, vector);
+- set_native_irq_info(irq, mask);
++ irq_desc[irq].affinity = mask;
+ }
+ #endif
+
+@@ -2120,7 +2120,7 @@ int io_apic_set_pci_routing (int ioapic,
+ ioapic_write_entry(ioapic, pin, entry);
+
+ spin_lock_irqsave(&ioapic_lock, flags);
+- set_native_irq_info(irq, TARGET_CPUS);
++ irq_desc[irq].affinity = TARGET_CPUS;
+ spin_unlock_irqrestore(&ioapic_lock, flags);
+
+ return 0;
+Index: linux-2.6.20/drivers/xen/balloon/sysfs.c
+===================================================================
+--- linux-2.6.20.orig/drivers/xen/balloon/sysfs.c
++++ linux-2.6.20/drivers/xen/balloon/sysfs.c
+@@ -31,6 +31,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "common.h"
+
+ #define BALLOON_CLASS_NAME "memory"
+Index: linux-2.6.20/drivers/xen/core/evtchn.c
+===================================================================
+--- linux-2.6.20.orig/drivers/xen/core/evtchn.c
++++ linux-2.6.20/drivers/xen/core/evtchn.c
+@@ -130,7 +130,7 @@ static void bind_evtchn_to_cpu(unsigned
+ int irq = evtchn_to_irq[chn];
+
+ BUG_ON(irq == -1);
+- set_native_irq_info(irq, cpumask_of_cpu(cpu));
++ irq_desc[irq].affinity = cpumask_of_cpu(cpu);
+
+ clear_bit(chn, (unsigned long *)cpu_evtchn_mask[cpu_evtchn[chn]]);
+ set_bit(chn, (unsigned long *)cpu_evtchn_mask[cpu]);
+@@ -143,7 +143,7 @@ static void init_evtchn_cpu_bindings(voi
+
+ /* By default all event channels notify CPU#0. */
+ for (i = 0; i < NR_IRQS; i++)
+- set_native_irq_info(i, cpumask_of_cpu(0));
++ irq_desc[i].affinity = cpumask_of_cpu(0);
+
+ memset(cpu_evtchn, 0, sizeof(cpu_evtchn));
+ memset(cpu_evtchn_mask[0], ~0, sizeof(cpu_evtchn_mask[0]));
+Index: linux-2.6.20/drivers/xen/netfront/netfront.c
+===================================================================
+--- linux-2.6.20.orig/drivers/xen/netfront/netfront.c
++++ linux-2.6.20/drivers/xen/netfront/netfront.c
+@@ -46,7 +46,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
+ #include
+@@ -1776,20 +1776,18 @@ static struct ethtool_ops network_ethtoo
+ };
+
+ #ifdef CONFIG_SYSFS
+-static ssize_t show_rxbuf_min(struct class_device *cd, char *buf)
++static ssize_t show_rxbuf_min(struct device *dev, struct device_attribute *attr, char *buf)
+ {
+- struct net_device *netdev = container_of(cd, struct net_device,
+- class_dev);
++ struct net_device *netdev = container_of(dev, struct net_device, dev);
+ struct netfront_info *info = netdev_priv(netdev);
+
+ return sprintf(buf, "%u\n", info->rx_min_target);
+ }
+
+-static ssize_t store_rxbuf_min(struct class_device *cd,
++static ssize_t store_rxbuf_min(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t len)
+ {
+- struct net_device *netdev = container_of(cd, struct net_device,
+- class_dev);
++ struct net_device *netdev = container_of(dev, struct net_device, dev);
+ struct netfront_info *np = netdev_priv(netdev);
+ char *endp;
+ unsigned long target;
+@@ -1819,20 +1817,17 @@ static ssize_t store_rxbuf_min(struct cl
+ return len;
+ }
+
+-static ssize_t show_rxbuf_max(struct class_device *cd, char *buf)
++static ssize_t show_rxbuf_max(struct device *dev, struct device_attribute *attr, char *buf)
+ {
+- struct net_device *netdev = container_of(cd, struct net_device,
+- class_dev);
++ struct net_device *netdev = container_of(dev, struct net_device, dev);
+ struct netfront_info *info = netdev_priv(netdev);
+
+ return sprintf(buf, "%u\n", info->rx_max_target);
+ }
+
+-static ssize_t store_rxbuf_max(struct class_device *cd,
+- const char *buf, size_t len)
++static ssize_t store_rxbuf_max(struct device *dev, struct device_attribute *attr, const char *buf, size_t len)
+ {
+- struct net_device *netdev = container_of(cd, struct net_device,
+- class_dev);
++ struct net_device *netdev = container_of(dev, struct net_device, dev);
+ struct netfront_info *np = netdev_priv(netdev);
+ char *endp;
+ unsigned long target;
+@@ -1862,16 +1857,15 @@ static ssize_t store_rxbuf_max(struct cl
+ return len;
+ }
+
+-static ssize_t show_rxbuf_cur(struct class_device *cd, char *buf)
++static ssize_t show_rxbuf_cur(struct device *dev, struct device_attribute *attr, char *buf)
+ {
+- struct net_device *netdev = container_of(cd, struct net_device,
+- class_dev);
++ struct net_device *netdev = container_of(dev, struct net_device, dev);
+ struct netfront_info *info = netdev_priv(netdev);
+
+ return sprintf(buf, "%u\n", info->rx_target);
+ }
+
+-static const struct class_device_attribute xennet_attrs[] = {
++static struct device_attribute xennet_attrs[] = {
+ __ATTR(rxbuf_min, S_IRUGO|S_IWUSR, show_rxbuf_min, store_rxbuf_min),
+ __ATTR(rxbuf_max, S_IRUGO|S_IWUSR, show_rxbuf_max, store_rxbuf_max),
+ __ATTR(rxbuf_cur, S_IRUGO, show_rxbuf_cur, NULL),
+@@ -1883,8 +1877,7 @@ static int xennet_sysfs_addif(struct net
+ int error = 0;
+
+ for (i = 0; i < ARRAY_SIZE(xennet_attrs); i++) {
+- error = class_device_create_file(&netdev->class_dev,
+- &xennet_attrs[i]);
++ error = device_create_file(&netdev->dev, &xennet_attrs[i]);
+ if (error)
+ goto fail;
+ }
+@@ -1892,7 +1885,7 @@ static int xennet_sysfs_addif(struct net
+
+ fail:
+ while (--i >= 0)
+- class_device_remove_file(&netdev->class_dev,
++ device_remove_file(&netdev->dev,
+ &xennet_attrs[i]);
+ return error;
+ }
+@@ -1902,7 +1895,7 @@ static void xennet_sysfs_delif(struct ne
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(xennet_attrs); i++) {
+- class_device_remove_file(&netdev->class_dev,
++ device_remove_file(&netdev->dev,
+ &xennet_attrs[i]);
+ }
+ }
+Index: linux-2.6.20/include/asm-i386/mach-xen/asm/pgalloc.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-i386/mach-xen/asm/pgalloc.h
++++ linux-2.6.20/include/asm-i386/mach-xen/asm/pgalloc.h
+@@ -56,4 +53,12 @@ extern void pte_free(struct page *pte);
+
+ #define check_pgt_cache() do { } while (0)
+
++/* FIXME */
++#define paravirt_alloc_pt(pfn) do { } while (0)
++#define paravirt_alloc_pd(pfn) do { } while (0)
++#define paravirt_alloc_pd(pfn) do { } while (0)
++#define paravirt_alloc_pd_clone(pfn, clonepfn, start, count) do { } while (0)
++#define paravirt_release_pt(pfn) do { } while (0)
++#define paravirt_release_pd(pfn) do { } while (0)
++
+ #endif /* _I386_PGALLOC_H */
+Index: linux-2.6.20/include/asm-i386/mach-xen/asm/processor.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-i386/mach-xen/asm/processor.h
++++ linux-2.6.20/include/asm-i386/mach-xen/asm/processor.h
+@@ -450,7 +450,7 @@ struct thread_struct {
+
+ #define start_thread(regs, new_eip, new_esp) do { \
+ __asm__("movl %0,%%fs": :"r" (0)); \
+- regs->xgs = 0; \
++ regs->xfs = 0; \
+ set_fs(USER_DS); \
+ regs->xds = __USER_DS; \
+ regs->xes = __USER_DS; \
+Index: linux-2.6.20/include/asm-i386/tsc.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-i386/tsc.h
++++ linux-2.6.20/include/asm-i386/tsc.h
+@@ -54,7 +54,11 @@ static __always_inline cycles_t get_cycl
+
+ extern void tsc_init(void);
+ extern void mark_tsc_unstable(void);
++#ifdef CONFIG_XEN
++static inline int unsynchronized_tsc(void) { return 0; }
++#else
+ extern int unsynchronized_tsc(void);
++#endif
+ extern void init_tsc_clocksource(void);
+
+ /*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen-x86-no-lapic new/patches.xen/xen-x86-no-lapic
--- old/patches.xen/xen-x86-no-lapic 2007-02-13 09:08:39.000000000 +0100
+++ new/patches.xen/xen-x86-no-lapic 2007-03-20 09:43:29.000000000 +0100
@@ -868,14 +868,11 @@
/*
* Basic functions accessing APICs.
-@@ -116,18 +118,21 @@ extern void enable_APIC_timer(void);
+@@ -116,15 +118,18 @@ extern void enable_APIC_timer(void);
extern void enable_NMI_through_LVT0 (void * dummy);
-#ifndef CONFIG_XEN
- void smp_send_timer_broadcast_ipi(void);
- void switch_APIC_timer_to_ipi(void *cpumask);
- void switch_ipi_to_APIC_timer(void *cpumask);
#define ARCH_APICTIMER_STOPS_ON_C3 1
-#endif
++++++ series.conf ++++++
--- kernel-source/series.conf 2007-03-16 09:01:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-03-21 08:34:08.000000000 +0100
@@ -20,8 +20,9 @@
# latest standard kernel patches
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
- patches.kernel.org/patch-2.6.20.1
- patches.kernel.org/patch-2.6.20.1-2
+ patches.kernel.org/patch-2.6.21-rc4
+ patches.kernel.org/patch-2.6.21-rc4-git3
+ patches.kernel.org/patch-2.6.21-rc4-git3-git5
########################################################
#
@@ -44,41 +45,6 @@
# workarounds
- ########################################################
- #
- # increase command line limit
- #
- patches.suse/dynamic-kernel-command-line-alpha.patch
- patches.suse/dynamic-kernel-command-line-arm.patch
- patches.suse/dynamic-kernel-command-line-arm26.patch
- patches.suse/dynamic-kernel-command-line-avr32.patch
- patches.suse/dynamic-kernel-command-line-common.patch
- patches.suse/dynamic-kernel-command-line-cris.patch
- patches.suse/dynamic-kernel-command-line-frv.patch
- patches.suse/dynamic-kernel-command-line-h8300.patch
- patches.suse/dynamic-kernel-command-line-i386.patch
- patches.suse/dynamic-kernel-command-line-ia64.patch
- patches.suse/dynamic-kernel-command-line-ia64-fix.patch
- patches.suse/dynamic-kernel-command-line-m32r.patch
- patches.suse/dynamic-kernel-command-line-m68k.patch
- patches.suse/dynamic-kernel-command-line-m68knommu.patch
- patches.suse/dynamic-kernel-command-line-mips.patch
- patches.suse/dynamic-kernel-command-line-parisc.patch
- patches.suse/dynamic-kernel-command-line-powerpc.patch
- patches.suse/dynamic-kernel-command-line-ppc.patch
- patches.suse/dynamic-kernel-command-line-s390.patch
- patches.suse/dynamic-kernel-command-line-sh.patch
- patches.suse/dynamic-kernel-command-line-sh64.patch
- patches.suse/dynamic-kernel-command-line-sparc.patch
- patches.suse/dynamic-kernel-command-line-sparc64.patch
- patches.suse/dynamic-kernel-command-line-um.patch
- patches.suse/dynamic-kernel-command-line-v850.patch
- patches.suse/dynamic-kernel-command-line-x86_64.patch
- patches.suse/dynamic-kernel-command-line-xtensa.patch
- patches.suse/dynamic-kernel-command-line-fixups.patch
- patches.suse/i386-2048-byte-command-line.patch
- patches.suse/ia64-2048-byte-command-line.patch
- patches.suse/x86_64-2048-byte-command-line.patch
# #302001
patches.suse/add-IV-generation-method-null-to-dm-crypt
@@ -89,7 +55,6 @@
#
# ia64
- patches.arch/stack-limit
# i386
@@ -105,22 +70,16 @@
# numa mempolicy
# suse ppc
- patches.suse/ppc-powerbook-touchpad-quirk.patch
patches.suse/ppc-powerbook-usb-fn-key-default.patch
- patches.arch/ppc-via-pmu-acpower.patch
patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch
patches.suse/suse-ppc32-mol.patch
patches.suse/suse-ppc32-mol-kbuild.patch
# suse ppc64
- patches.suse/snd-aoa-device-symlinks.patch
patches.drivers/ppc64-adb
patches.suse/suse-ppc64-branding
patches.arch/ppc64-xmon-dmesg-printing.patch
- patches.fixes/ignore-aix-disk-label.patch
- patches.arch/ppc-pci-fixup_resource.patch
patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch
- patches.arch/ppc-iseries-viocd-softlockup.patch
# KDB v4.4
patches.suse/kdb-common
@@ -162,13 +121,9 @@
# Fix new HP (nx6125) stuck/canceled ACPI processes (#226069)
patches.fixes/acpi_execute_notify_threaded.patch
- patches.fixes/acpi_fan-problem-fix.patch
- patches.fixes/acpi-power-resources-resume-fix-2.patch
patches.fixes/acpi_force-fan-active.patch
- patches.fixes/serio-cleanup-to-bus_2.patch
- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch
patches.suse/apm_setup_UP.diff
@@ -181,11 +136,6 @@
########################################################
# NFS
########################################################
- # These patches add register_sysctl_table_path() and convert
- # any NFS related users of register_sysctl_table
- patches.suse/register_sysctl_path
- patches.suse/nfs-sysctl
- patches.suse/fs-sysctl-register-convert
patches.fixes/nfs-readdir-timestamp
@@ -256,9 +206,7 @@
# Device drivers
#
########################################################
-+hare patches.drivers/ide-acpi-support
-+hare patches.drivers/libata-acpi-update
patches.drivers/e1000-eeprom-cksum.patch
########################################################
@@ -266,19 +214,7 @@
########################################################
- patches.fixes/libata-ata_piix-acer-aspire-fix
- patches.fixes/libata-pata_sis-udma66-fix
- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers
- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status
- patches.drivers/ide-backport-hpt366-from-devel
- patches.drivers/ide-jmicron-match-class-if-libata-is-configured
- patches.suse/libata-pata_sl82c105-reset-delay.patch
- patches.drivers/libata-clear-TF-before-IDENTIFYing
patches.drivers/libata-add-waits-for-govault
- patches.drivers/libata-ahci-fix-spurious-IRQ-reporting
- patches.drivers/libata-jmicron-match-class-instead-of-function-nr
- patches.drivers/libata-ahci-RAID-mode-SATA-patch-for-Intel-ICH9M
- patches.drivers/libata-blacklist-FUJITSU-MHT2060BH-for-NCQ
patches.drivers/libata-hardreset-on-SERR_INTERNAL
# Remaining SCSI patches (garloff)
@@ -469,7 +405,6 @@
patches.xen/pmd-shared.patch
patches.xen/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch
patches.xen/xenoprof-generic.patch
- patches.xen/softlockup-no-idle-hz.patch
# bulk stuff, new files for xen
patches.xen/xen3-auto-xen-arch.diff
@@ -522,3 +457,4 @@
patches.xen/xen-blkback-bimodal-suse
patches.xen/xen-pvfb-split-kbd-ptr
patches.xen/xen-console-default
+ patches.xen/xen3-patch-2.6.21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org