Hello community,
here is the log from the commit of package kernel-source
checked in at Wed Aug 15 20:42:03 CEST 2007.
--------
--- kernel-source/kernel-bigsmp.changes 2007-08-14 17:28:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-08-15 20:28:00.000000000 +0200
@@ -1,0 +2,37 @@
+Wed Aug 15 19:48:03 CEST 2007 - schwab@suse.de
+
+- No longer build with gcc41.
+
+-------------------------------------------------------------------
+Wed Aug 15 17:42:58 CEST 2007 - bwalle@suse.de
+
+- rpm/kernel-binary.spec.in: Update perl-Bootloader version in
+ requirement (#263819)
+
+-------------------------------------------------------------------
+Wed Aug 15 15:16:04 CEST 2007 - ak@suse.de
+
+- patches.arch/x86-early-quirks-unificiation: x86: Unify i386
+ and x86-64 early quirks.
+- patches.arch/x86-nvidia-timer-quirk: Replace nvidia timer
+ override quirk with pci id list and unify quirks.
+- patches.arch/x86-fam10-l3cache: i386: Add L3 cache support to
+ AMD CPUID4 emulation.
+- patches.arch/i386-compat-vdso: i386: allow debuggers to access
+ the vsyscall page with compat vDSO.
+- patches.xen/xen3-auto-arch-i386.diff: Merge
+- patches.xen/xen-x86-no-lapic: Merge
+- patches.xen/xen3-x86-early-quirks-unificiation: x86: Unify
+ i386 and x86-64 early quirks.
+- patches.xen/xen3-x86-fam10-l3cache: i386: Add L3 cache support
+ to AMD CPUID4 emulation.
+
+-------------------------------------------------------------------
+Wed Aug 15 09:38:04 CEST 2007 - teheo@suse.de
+
+VIA ahci's lie about PMP support too. Blacklist them.
+
+- patches.drivers/libata-ahci-no-pmp.patch: ahci: disable PMP
+ support on SB600/700 (299010).
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-rt.changes: same change
kernel-rt_debug.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.DN2482/_old 2007-08-15 20:38:24.000000000 +0200
+++ /var/tmp/diff_new_pack.DN2482/_new 2007-08-15 20:38:24.000000000 +0200
@@ -25,7 +25,6 @@
%define build_xen 0
%define build_um 0
%define build_vanilla 0
-%define build_with_gcc41 0
%if %{build_flavor} == "kdump"
%define build_kdump 1
%endif
@@ -38,28 +37,13 @@
%if %{build_flavor} == "vanilla"
%define build_vanilla 1
%endif
-%if %suse_version > 1020
-# workaround for http://gcc.gnu.org/PR31490
-%if %{build_flavor} == "ppc64"
-%define build_with_gcc41 1
-%endif
-%ifarch ia64
-%define build_with_gcc41 1
-%endif
-%if %{build_flavor} == "kdump"
-%define build_with_gcc41 1
-%endif
-%endif
Summary: Kernel with PAE Support
Version: 2.6.22.2
-Release: 6
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
BuildRequires: coreutils module-init-tools
-%if %{build_with_gcc41}
-BuildRequires: gcc41
-%endif
%ifarch ppc ppc64
# for PS3 zImage
BuildRequires: dtc
@@ -72,7 +56,7 @@
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.14
+Requires(post): perl-Bootloader >= 0.4.21
Requires(post): /sbin/update-bootloader
Requires(post): mkinitrd >= 1.2
#!BuildIgnore: perl-Bootloader mkinitrd
@@ -179,7 +163,7 @@
-Source Timestamp: 2007/08/14 15:25:13 UTC
+Source Timestamp: 2007/08/15 17:49:25 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -260,20 +244,6 @@
%endif
%build
-rm -f linux-2.6.22/.kernel-binary.spec.buildenv
-%if %{build_with_gcc41}
-# unable to pass CC="gcc -m64" to MAKE_ARGS
-mkdir blubber
-cat > blubber/gcc <<-'EOF'
-#!/bin/sh
-exec gcc-4.1 "$@"
-EOF
-chmod 755 blubber/gcc
-cat > linux-2.6.22/.kernel-binary.spec.buildenv <> ../.rpm-defs
-cat >> .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv <http://www.kernel.org/
Summary: Internal dummy package for synchronizing release numbers
Version: 2.6.22.2
-Release: 6
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: off
@@ -28,7 +28,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2007/08/14 15:25:13 UTC
+Source Timestamp: 2007/08/15 17:49:25 UTC
%install
@@ -41,6 +41,30 @@
/etc/dummy
%changelog
+* Wed Aug 15 2007 - schwab@suse.de
+- No longer build with gcc41.
+* Wed Aug 15 2007 - bwalle@suse.de
+- rpm/kernel-binary.spec.in: Update perl-Bootloader version in
+ requirement (#263819)
+* Wed Aug 15 2007 - ak@suse.de
+- patches.arch/x86-early-quirks-unificiation: x86: Unify i386
+ and x86-64 early quirks.
+- patches.arch/x86-nvidia-timer-quirk: Replace nvidia timer
+ override quirk with pci id list and unify quirks.
+- patches.arch/x86-fam10-l3cache: i386: Add L3 cache support to
+ AMD CPUID4 emulation.
+- patches.arch/i386-compat-vdso: i386: allow debuggers to access
+ the vsyscall page with compat vDSO.
+- patches.xen/xen3-auto-arch-i386.diff: Merge
+- patches.xen/xen-x86-no-lapic: Merge
+- patches.xen/xen3-x86-early-quirks-unificiation: x86: Unify
+ i386 and x86-64 early quirks.
+- patches.xen/xen3-x86-fam10-l3cache: i386: Add L3 cache support
+ to AMD CPUID4 emulation.
+* Wed Aug 15 2007 - teheo@suse.de
+ VIA ahci's lie about PMP support too. Blacklist them.
+- patches.drivers/libata-ahci-no-pmp.patch: ahci: disable PMP
+ support on SB600/700 (299010).
* Tue Aug 14 2007 - olh@suse.de
- fix patches.arch/ppc-ps3-edd2a9d185799354db255de62c3ed1f2b1c6b0f4.patch
reset error code to 0 on successful probing, to actually find disks
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.DN2482/_old 2007-08-15 20:38:25.000000000 +0200
+++ /var/tmp/diff_new_pack.DN2482/_new 2007-08-15 20:38:25.000000000 +0200
@@ -25,7 +25,6 @@
%define build_xen 0
%define build_um 0
%define build_vanilla 0
-%define build_with_gcc41 0
%if %{build_flavor} == "kdump"
%define build_kdump 1
%endif
@@ -38,28 +37,13 @@
%if %{build_flavor} == "vanilla"
%define build_vanilla 1
%endif
-%if %suse_version > 1020
-# workaround for http://gcc.gnu.org/PR31490
-%if %{build_flavor} == "ppc64"
-%define build_with_gcc41 1
-%endif
-%ifarch ia64
-%define build_with_gcc41 1
-%endif
-%if %{build_flavor} == "kdump"
-%define build_with_gcc41 1
-%endif
-%endif
Summary: kernel for kdump
Version: 2.6.22.2
-Release: 6
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
BuildRequires: coreutils module-init-tools
-%if %{build_with_gcc41}
-BuildRequires: gcc41
-%endif
%ifarch ppc ppc64
# for PS3 zImage
BuildRequires: dtc
@@ -72,7 +56,7 @@
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.14
+Requires(post): perl-Bootloader >= 0.4.21
Requires(post): /sbin/update-bootloader
Requires(post): mkinitrd >= 1.2
#!BuildIgnore: perl-Bootloader mkinitrd
@@ -183,7 +167,7 @@
-Source Timestamp: 2007/08/14 15:25:13 UTC
+Source Timestamp: 2007/08/15 17:49:25 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -264,20 +248,6 @@
%endif
%build
-rm -f linux-2.6.22/.kernel-binary.spec.buildenv
-%if %{build_with_gcc41}
-# unable to pass CC="gcc -m64" to MAKE_ARGS
-mkdir blubber
-cat > blubber/gcc <<-'EOF'
-#!/bin/sh
-exec gcc-4.1 "$@"
-EOF
-chmod 755 blubber/gcc
-cat > linux-2.6.22/.kernel-binary.spec.buildenv <> ../.rpm-defs
-cat >> .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv < 1020
-# workaround for http://gcc.gnu.org/PR31490
-%if %{build_flavor} == "ppc64"
-%define build_with_gcc41 1
-%endif
-%ifarch ia64
-%define build_with_gcc41 1
-%endif
-%if %{build_flavor} == "kdump"
-%define build_with_gcc41 1
-%endif
-%endif
Summary: Kernel for ppc64 Systems
Version: 2.6.22.2
-Release: 6
+Release: 7
License: GPL v2 or later, LGPL v2 or later
Group: System/Kernel
Autoreqprov: on
BuildRequires: coreutils module-init-tools
-%if %{build_with_gcc41}
-BuildRequires: gcc41
-%endif
%ifarch ppc ppc64
# for PS3 zImage
BuildRequires: dtc
@@ -71,7 +55,7 @@
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.14
+Requires(post): perl-Bootloader >= 0.4.21
Requires(post): /sbin/update-bootloader
Requires(post): mkinitrd >= 1.2
#!BuildIgnore: perl-Bootloader mkinitrd
@@ -195,7 +179,7 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/08/14 15:25:13 UTC
+Source Timestamp: 2007/08/15 17:49:25 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -276,20 +260,6 @@
%endif
%build
-rm -f linux-2.6.22/.kernel-binary.spec.buildenv
-%if %{build_with_gcc41}
-# unable to pass CC="gcc -m64" to MAKE_ARGS
-mkdir blubber
-cat > blubber/gcc <<-'EOF'
-#!/bin/sh
-exec gcc-4.1 "$@"
-EOF
-chmod 755 blubber/gcc
-cat > linux-2.6.22/.kernel-binary.spec.buildenv <> ../.rpm-defs
-cat >> .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv < 1020
-# workaround for http://gcc.gnu.org/PR31490
-%if %{build_flavor} == "ppc64"
-%define build_with_gcc41 1
-%endif
-%ifarch ia64
-%define build_with_gcc41 1
-%endif
-%if %{build_flavor} == "kdump"
-%define build_with_gcc41 1
-%endif
-%endif
Summary: A Debug Version of the Kernel
Version: 2.6.22.2
-Release: 6
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
BuildRequires: coreutils module-init-tools
-%if %{build_with_gcc41}
-BuildRequires: gcc41
-%endif
%ifarch ppc ppc64
# for PS3 zImage
BuildRequires: dtc
@@ -72,7 +56,7 @@
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.14
+Requires(post): perl-Bootloader >= 0.4.21
Requires(post): /sbin/update-bootloader
Requires(post): mkinitrd >= 1.2
#!BuildIgnore: perl-Bootloader mkinitrd
@@ -181,7 +165,7 @@
-Source Timestamp: 2007/08/14 15:25:13 UTC
+Source Timestamp: 2007/08/15 17:49:25 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -262,20 +246,6 @@
%endif
%build
-rm -f linux-2.6.22/.kernel-binary.spec.buildenv
-%if %{build_with_gcc41}
-# unable to pass CC="gcc -m64" to MAKE_ARGS
-mkdir blubber
-cat > blubber/gcc <<-'EOF'
-#!/bin/sh
-exec gcc-4.1 "$@"
-EOF
-chmod 755 blubber/gcc
-cat > linux-2.6.22/.kernel-binary.spec.buildenv <> ../.rpm-defs
-cat >> .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv < 1020
-# workaround for http://gcc.gnu.org/PR31490
-%if %{build_flavor} == "ppc64"
-%define build_with_gcc41 1
-%endif
-%ifarch ia64
-%define build_with_gcc41 1
-%endif
-%if %{build_flavor} == "kdump"
-%define build_with_gcc41 1
-%endif
-%endif
Summary: The Realtime Linux Kernel
Version: 2.6.22.2
-Release: 6
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
BuildRequires: coreutils module-init-tools
-%if %{build_with_gcc41}
-BuildRequires: gcc41
-%endif
%ifarch ppc ppc64
# for PS3 zImage
BuildRequires: dtc
@@ -72,7 +56,7 @@
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.14
+Requires(post): perl-Bootloader >= 0.4.21
Requires(post): /sbin/update-bootloader
Requires(post): mkinitrd >= 1.2
#!BuildIgnore: perl-Bootloader mkinitrd
@@ -186,7 +170,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/08/14 15:25:13 UTC
+Source Timestamp: 2007/08/15 17:49:25 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -267,20 +251,6 @@
%endif
%build
-rm -f linux-2.6.22/.kernel-binary.spec.buildenv
-%if %{build_with_gcc41}
-# unable to pass CC="gcc -m64" to MAKE_ARGS
-mkdir blubber
-cat > blubber/gcc <<-'EOF'
-#!/bin/sh
-exec gcc-4.1 "$@"
-EOF
-chmod 755 blubber/gcc
-cat > linux-2.6.22/.kernel-binary.spec.buildenv <> ../.rpm-defs
-cat >> .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv < 1020
-# workaround for http://gcc.gnu.org/PR31490
-%if %{build_flavor} == "ppc64"
-%define build_with_gcc41 1
-%endif
-%ifarch ia64
-%define build_with_gcc41 1
-%endif
-%if %{build_flavor} == "kdump"
-%define build_with_gcc41 1
-%endif
-%endif
Summary: The Standard Kernel
Version: 2.6.22.2
-Release: 4
+Release: 5
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
BuildRequires: coreutils module-init-tools
-%if %{build_with_gcc41}
-BuildRequires: gcc41
-%endif
%ifarch ppc ppc64
# for PS3 zImage
BuildRequires: dtc
@@ -72,7 +56,7 @@
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.14
+Requires(post): perl-Bootloader >= 0.4.21
Requires(post): /sbin/update-bootloader
Requires(post): mkinitrd >= 1.2
#!BuildIgnore: perl-Bootloader mkinitrd
@@ -177,7 +161,7 @@
-Source Timestamp: 2007/08/14 15:25:13 UTC
+Source Timestamp: 2007/08/15 17:49:25 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -258,20 +242,6 @@
%endif
%build
-rm -f linux-2.6.22/.kernel-binary.spec.buildenv
-%if %{build_with_gcc41}
-# unable to pass CC="gcc -m64" to MAKE_ARGS
-mkdir blubber
-cat > blubber/gcc <<-'EOF'
-#!/bin/sh
-exec gcc-4.1 "$@"
-EOF
-chmod 755 blubber/gcc
-cat > linux-2.6.22/.kernel-binary.spec.buildenv <> ../.rpm-defs
-cat >> .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv < 1020
-# workaround for http://gcc.gnu.org/PR31490
-%if %{build_flavor} == "ppc64"
-%define build_with_gcc41 1
-%endif
-%ifarch ia64
-%define build_with_gcc41 1
-%endif
-%if %{build_flavor} == "kdump"
-%define build_with_gcc41 1
-%endif
-%endif
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.22.2
-Release: 6
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
BuildRequires: coreutils module-init-tools
-%if %{build_with_gcc41}
-BuildRequires: gcc41
-%endif
%ifarch ppc ppc64
# for PS3 zImage
BuildRequires: dtc
@@ -72,7 +56,7 @@
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.14
+Requires(post): perl-Bootloader >= 0.4.21
Requires(post): /sbin/update-bootloader
Requires(post): mkinitrd >= 1.2
#!BuildIgnore: perl-Bootloader mkinitrd
@@ -197,7 +181,7 @@
-Source Timestamp: 2007/08/14 15:25:13 UTC
+Source Timestamp: 2007/08/15 17:49:25 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -278,20 +262,6 @@
%endif
%build
-rm -f linux-2.6.22/.kernel-binary.spec.buildenv
-%if %{build_with_gcc41}
-# unable to pass CC="gcc -m64" to MAKE_ARGS
-mkdir blubber
-cat > blubber/gcc <<-'EOF'
-#!/bin/sh
-exec gcc-4.1 "$@"
-EOF
-chmod 755 blubber/gcc
-cat > linux-2.6.22/.kernel-binary.spec.buildenv <> ../.rpm-defs
-cat >> .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv <
+Signed-off-by: Jan Beulich
+Signed-off-by: Andi Kleen
+
+ arch/i386/kernel/sysenter.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+Index: linux/arch/i386/kernel/sysenter.c
+===================================================================
+--- linux.orig/arch/i386/kernel/sysenter.c
++++ linux/arch/i386/kernel/sysenter.c
+@@ -336,7 +336,9 @@ struct vm_area_struct *get_gate_vma(stru
+
+ int in_gate_area(struct task_struct *task, unsigned long addr)
+ {
+- return 0;
++ const struct vm_area_struct *vma = get_gate_vma(task);
++
++ return vma && addr >= vma->vm_start && addr < vma->vm_end;
+ }
+
+ int in_gate_area_no_task(unsigned long addr)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-early-quirks-unificiation new/patches.arch/x86-early-quirks-unificiation
--- old/patches.arch/x86-early-quirks-unificiation 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-early-quirks-unificiation 2007-08-15 15:16:43.000000000 +0200
@@ -0,0 +1,254 @@
+Subject: x86: Unify i386 and x86-64 early quirks
+
+They were already very similar; just use the same file now.
+
+Cc: lenb@kernel.org
+
+Signed-off-by: Andi Kleen
+
+---
+ arch/i386/kernel/Makefile | 2
+ arch/i386/kernel/acpi/Makefile | 3 -
+ arch/i386/kernel/acpi/earlyquirk.c | 84 -------------------------------------
+ arch/i386/kernel/setup.c | 4 -
+ arch/x86_64/kernel/early-quirks.c | 12 ++++-
+ include/asm-i386/acpi.h | 6 --
+ include/asm-x86_64/io_apic.h | 2
+ include/asm-x86_64/proto.h | 2
+ 8 files changed, 16 insertions(+), 99 deletions(-)
+
+Index: linux-2.6.22/arch/x86_64/kernel/early-quirks.c
+===================================================================
+--- linux-2.6.22.orig/arch/x86_64/kernel/early-quirks.c
++++ linux-2.6.22/arch/x86_64/kernel/early-quirks.c
+@@ -13,9 +13,14 @@
+ #include
+ #include
+ #include
+-#include
++#include
++#include
+ #include
+
++#ifdef CONFIG_X86_64
++#include
++#endif
++
+ static void __init via_bugs(void)
+ {
+ #ifdef CONFIG_IOMMU
+@@ -39,6 +44,7 @@ static int __init nvidia_hpet_check(stru
+ static void __init nvidia_bugs(void)
+ {
+ #ifdef CONFIG_ACPI
++#ifdef CONFIG_X86_IO_APIC
+ /*
+ * All timer overrides on Nvidia are
+ * wrong unless HPET is enabled.
+@@ -58,17 +64,20 @@ static void __init nvidia_bugs(void)
+ "try acpi_use_timer_override\n");
+ }
+ #endif
++#endif
+ /* RED-PEN skip them on mptables too? */
+
+ }
+
+ static void __init ati_bugs(void)
+ {
++#ifdef CONFIG_X86_IO_APIC
+ if (timer_over_8254 == 1) {
+ timer_over_8254 = 0;
+ printk(KERN_INFO
+ "ATI board detected. Disabling timer routing over 8254.\n");
+ }
++#endif
+ }
+
+ struct chipset {
+Index: linux-2.6.22/arch/i386/kernel/Makefile
+===================================================================
+--- linux-2.6.22.orig/arch/i386/kernel/Makefile
++++ linux-2.6.22/arch/i386/kernel/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_MCA) += mca.o
+ obj-$(CONFIG_X86_MSR) += msr.o
+ obj-$(CONFIG_X86_CPUID) += cpuid.o
+ obj-$(CONFIG_MICROCODE) += microcode.o
++obj-$(CONFIG_PCI) += early-quirks.o
+ obj-$(CONFIG_APM) += apm.o
+ obj-$(CONFIG_X86_SMP) += smp.o smpboot.o tsc_sync.o
+ obj-$(CONFIG_SMP) += smpcommon.o
+@@ -85,4 +86,5 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall.
+
+ k8-y += ../../x86_64/kernel/k8.o
+ stacktrace-y += ../../x86_64/kernel/stacktrace.o
++early-quirks-y += ../../x86_64/kernel/early-quirks.o
+
+Index: linux-2.6.22/arch/i386/kernel/acpi/earlyquirk.c
+===================================================================
+--- linux-2.6.22.orig/arch/i386/kernel/acpi/earlyquirk.c
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/*
+- * Do early PCI probing for bug detection when the main PCI subsystem is
+- * not up yet.
+- */
+-#include
+-#include
+-#include
+-#include
+-
+-#include
+-#include
+-#include
+-
+-#ifdef CONFIG_ACPI
+-
+-static int __init nvidia_hpet_check(struct acpi_table_header *header)
+-{
+- return 0;
+-}
+-#endif
+-
+-static int __init check_bridge(int vendor, int device)
+-{
+-#ifdef CONFIG_ACPI
+- static int warned;
+- /* According to Nvidia all timer overrides are bogus unless HPET
+- is enabled. */
+- if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
+- if (!warned && acpi_table_parse(ACPI_SIG_HPET,
+- nvidia_hpet_check)) {
+- warned = 1;
+- acpi_skip_timer_override = 1;
+- printk(KERN_INFO "Nvidia board "
+- "detected. Ignoring ACPI "
+- "timer override.\n");
+- printk(KERN_INFO "If you got timer trouble "
+- "try acpi_use_timer_override\n");
+-
+- }
+- }
+-#endif
+- if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
+- timer_over_8254 = 0;
+- printk(KERN_INFO "ATI board detected. Disabling timer routing "
+- "over 8254.\n");
+- }
+- return 0;
+-}
+-
+-void __init check_acpi_pci(void)
+-{
+- int num, slot, func;
+-
+- /* Assume the machine supports type 1. If not it will
+- always read ffffffff and should not have any side effect.
+- Actually a few buggy systems can machine check. Allow the user
+- to disable it by command line option at least -AK */
+- if (!early_pci_allowed())
+- return;
+-
+- /* Poor man's PCI discovery */
+- for (num = 0; num < 32; num++) {
+- for (slot = 0; slot < 32; slot++) {
+- for (func = 0; func < 8; func++) {
+- u32 class;
+- u32 vendor;
+- class = read_pci_config(num, slot, func,
+- PCI_CLASS_REVISION);
+- if (class == 0xffffffff)
+- break;
+-
+- if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
+- continue;
+-
+- vendor = read_pci_config(num, slot, func,
+- PCI_VENDOR_ID);
+-
+- if (check_bridge(vendor & 0xffff, vendor >> 16))
+- return;
+- }
+-
+- }
+- }
+-}
+Index: linux-2.6.22/arch/i386/kernel/setup.c
+===================================================================
+--- linux-2.6.22.orig/arch/i386/kernel/setup.c
++++ linux-2.6.22/arch/i386/kernel/setup.c
+@@ -627,9 +627,7 @@ void __init setup_arch(char **cmdline_p)
+ #endif
+
+ #ifdef CONFIG_PCI
+-#ifdef CONFIG_X86_IO_APIC
+- check_acpi_pci(); /* Checks more than just ACPI actually */
+-#endif
++ early_quirks();
+ #endif
+
+ #ifdef CONFIG_ACPI
+Index: linux-2.6.22/include/asm-i386/acpi.h
+===================================================================
+--- linux-2.6.22.orig/include/asm-i386/acpi.h
++++ linux-2.6.22/include/asm-i386/acpi.h
+@@ -81,11 +81,7 @@ int __acpi_release_global_lock(unsigned
+ :"=r"(n_hi), "=r"(n_lo) \
+ :"0"(n_hi), "1"(n_lo))
+
+-#ifdef CONFIG_X86_IO_APIC
+-extern void check_acpi_pci(void);
+-#else
+-static inline void check_acpi_pci(void) { }
+-#endif
++extern void early_quirks(void);
+
+ #ifdef CONFIG_ACPI
+ extern int acpi_lapic;
+Index: linux-2.6.22/arch/i386/kernel/acpi/Makefile
+===================================================================
+--- linux-2.6.22.orig/arch/i386/kernel/acpi/Makefile
++++ linux-2.6.22/arch/i386/kernel/acpi/Makefile
+@@ -1,7 +1,4 @@
+ obj-$(CONFIG_ACPI) += boot.o
+-ifneq ($(CONFIG_PCI),)
+-obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
+-endif
+ obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
+
+ ifneq ($(CONFIG_ACPI_PROCESSOR),)
+Index: linux-2.6.22/include/asm-x86_64/io_apic.h
+===================================================================
+--- linux-2.6.22.orig/include/asm-x86_64/io_apic.h
++++ linux-2.6.22/include/asm-x86_64/io_apic.h
+@@ -127,4 +127,6 @@ void enable_NMI_through_LVT0 (void * dum
+
+ extern spinlock_t i8259A_lock;
+
++extern int timer_over_8254;
++
+ #endif
+Index: linux-2.6.22/include/asm-x86_64/proto.h
+===================================================================
+--- linux-2.6.22.orig/include/asm-x86_64/proto.h
++++ linux-2.6.22/include/asm-x86_64/proto.h
+@@ -106,8 +106,6 @@ extern int fix_aperture;
+ extern int reboot_force;
+ extern int notsc_setup(char *);
+
+-extern int timer_over_8254;
+-
+ extern int gsi_irq_sharing(int gsi);
+
+ extern void smp_local_timer_interrupt(void);
+Index: linux-2.6.22/include/asm-i386/dma.h
+===================================================================
+--- linux-2.6.22.orig/include/asm-i386/dma.h
++++ linux-2.6.22/include/asm-i386/dma.h
+@@ -294,4 +294,6 @@ extern int isa_dma_bridge_buggy;
+ #define isa_dma_bridge_buggy (0)
+ #endif
+
++#define MAX_DMA32_PFN ((4UL*1024*1024*1024) >> PAGE_SHIFT)
++
+ #endif /* _ASM_DMA_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-fam10-l3cache new/patches.arch/x86-fam10-l3cache
--- old/patches.arch/x86-fam10-l3cache 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-fam10-l3cache 2007-08-15 15:16:43.000000000 +0200
@@ -0,0 +1,176 @@
+Subject: i386: Add L3 cache support to AMD CPUID4 emulation
+
+With that an L3 cache is correctly reported in the cache information in /sys
+
+With fixes from Andreas Herrmann and Dean Gaudet and Joachim Deguara
+
+Signed-off-by: Andi Kleen
+
+---
+ arch/i386/kernel/cpu/amd.c | 8 ++-
+ arch/i386/kernel/cpu/intel_cacheinfo.c | 72 ++++++++++++++++++++++++---------
+ arch/x86_64/kernel/setup.c | 7 ++-
+ 3 files changed, 64 insertions(+), 23 deletions(-)
+
+Index: linux/arch/i386/kernel/cpu/intel_cacheinfo.c
+===================================================================
+--- linux.orig/arch/i386/kernel/cpu/intel_cacheinfo.c
++++ linux/arch/i386/kernel/cpu/intel_cacheinfo.c
+@@ -4,7 +4,7 @@
+ * Changes:
+ * Venkatesh Pallipadi : Adding cache identification through cpuid(4)
+ * Ashok Raj : Work with CPU hotplug infrastructure.
+- * Andi Kleen : CPUID4 emulation on AMD.
++ * Andi Kleen / Andreas Herrmann : CPUID4 emulation on AMD.
+ */
+
+ #include
+@@ -135,7 +135,7 @@ unsigned short num_cache_leaves;
+
+ /* AMD doesn't have CPUID4. Emulate it here to report the same
+ information to the user. This makes some assumptions about the machine:
+- No L3, L2 not shared, no SMT etc. that is currently true on AMD CPUs.
++ L2 not shared, no SMT etc. that is currently true on AMD CPUs.
+
+ In theory the TLBs could be reported as fake type (they are in "dummy").
+ Maybe later */
+@@ -159,13 +159,26 @@ union l2_cache {
+ unsigned val;
+ };
+
++union l3_cache {
++ struct {
++ unsigned line_size : 8;
++ unsigned lines_per_tag : 4;
++ unsigned assoc : 4;
++ unsigned res : 2;
++ unsigned size_encoded : 14;
++ };
++ unsigned val;
++};
++
+ static const unsigned short assocs[] = {
+ [1] = 1, [2] = 2, [4] = 4, [6] = 8,
+- [8] = 16,
++ [8] = 16, [0xa] = 32, [0xb] = 48,
++ [0xc] = 64,
+ [0xf] = 0xffff // ??
+- };
+-static const unsigned char levels[] = { 1, 1, 2 };
+-static const unsigned char types[] = { 1, 2, 3 };
++};
++
++static const unsigned char levels[] = { 1, 1, 2, 3 };
++static const unsigned char types[] = { 1, 2, 3, 3 };
+
+ static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,
+ union _cpuid4_leaf_ebx *ebx,
+@@ -175,37 +188,58 @@ static void __cpuinit amd_cpuid4(int lea
+ unsigned line_size, lines_per_tag, assoc, size_in_kb;
+ union l1_cache l1i, l1d;
+ union l2_cache l2;
++ union l3_cache l3;
++ union l1_cache *l1 = &l1d;
+
+ eax->full = 0;
+ ebx->full = 0;
+ ecx->full = 0;
+
+ cpuid(0x80000005, &dummy, &dummy, &l1d.val, &l1i.val);
+- cpuid(0x80000006, &dummy, &dummy, &l2.val, &dummy);
++ cpuid(0x80000006, &dummy, &dummy, &l2.val, &l3.val);
+
+- if (leaf > 2 || !l1d.val || !l1i.val || !l2.val)
+- return;
+-
+- eax->split.is_self_initializing = 1;
+- eax->split.type = types[leaf];
+- eax->split.level = levels[leaf];
+- eax->split.num_threads_sharing = 0;
+- eax->split.num_cores_on_die = current_cpu_data.x86_max_cores - 1;
+-
+- if (leaf <= 1) {
+- union l1_cache *l1 = leaf == 0 ? &l1d : &l1i;
++ switch (leaf) {
++ case 1:
++ l1 = &l1i;
++ case 0:
++ if (!l1->val)
++ return;
+ assoc = l1->assoc;
+ line_size = l1->line_size;
+ lines_per_tag = l1->lines_per_tag;
+ size_in_kb = l1->size_in_kb;
+- } else {
++ break;
++ case 2:
++ if (!l2.val)
++ return;
+ assoc = l2.assoc;
+ line_size = l2.line_size;
+ lines_per_tag = l2.lines_per_tag;
+ /* cpu_data has errata corrections for K7 applied */
+ size_in_kb = current_cpu_data.x86_cache_size;
++ break;
++ case 3:
++ if (!l3.val)
++ return;
++ assoc = l3.assoc;
++ line_size = l3.line_size;
++ lines_per_tag = l3.lines_per_tag;
++ size_in_kb = l3.size_encoded * 512;
++ break;
++ default:
++ return;
+ }
+
++ eax->split.is_self_initializing = 1;
++ eax->split.type = types[leaf];
++ eax->split.level = levels[leaf];
++ if (leaf == 3)
++ eax->split.num_threads_sharing = current_cpu_data.x86_max_cores - 1;
++ else
++ eax->split.num_threads_sharing = 0;
++ eax->split.num_cores_on_die = current_cpu_data.x86_max_cores - 1;
++
++
+ if (assoc == 0xf)
+ eax->split.is_fully_associative = 1;
+ ebx->split.coherency_line_size = line_size - 1;
+Index: linux/arch/x86_64/kernel/setup.c
+===================================================================
+--- linux.orig/arch/x86_64/kernel/setup.c
++++ linux/arch/x86_64/kernel/setup.c
+@@ -602,8 +602,11 @@ static void __cpuinit init_amd(struct cp
+ if (c->extended_cpuid_level >= 0x80000008)
+ amd_detect_cmp(c);
+
+- /* Fix cpuid4 emulation for more */
+- num_cache_leaves = 3;
++ if (c->extended_cpuid_level >= 0x80000006 &&
++ (cpuid_edx(0x80000006) & 0xf000))
++ num_cache_leaves = 4;
++ else
++ num_cache_leaves = 3;
+
+ /* RDTSC can be speculated around */
+ clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
+Index: linux/arch/i386/kernel/cpu/amd.c
+===================================================================
+--- linux.orig/arch/i386/kernel/cpu/amd.c
++++ linux/arch/i386/kernel/cpu/amd.c
+@@ -272,8 +272,12 @@ static void __cpuinit init_amd(struct cp
+ }
+ #endif
+
+- if (cpuid_eax(0x80000000) >= 0x80000006)
+- num_cache_leaves = 3;
++ if (cpuid_eax(0x80000000) >= 0x80000006) {
++ if ((c->x86 == 0x10) && (cpuid_edx(0x80000006) & 0xf000))
++ num_cache_leaves = 4;
++ else
++ num_cache_leaves = 3;
++ }
+
+ if (amd_apic_timer_broken())
+ set_bit(X86_FEATURE_LAPIC_TIMER_BROKEN, c->x86_capability);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-nvidia-timer-quirk new/patches.arch/x86-nvidia-timer-quirk
--- old/patches.arch/x86-nvidia-timer-quirk 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-nvidia-timer-quirk 2007-08-15 15:16:43.000000000 +0200
@@ -0,0 +1,121 @@
+Subject: Replace nvidia timer override quirk with pci id list and unify quirks
+
+This replaces the old NF3/NF4 reference BIOS timer override quirk with a device
+ID list. We need to ignore the timer override on these systems, but not
+ignore it on NF5 based systems. Previously this was distingushed by checking
+for HPET, but a lot of BIOS vendors didn't enable HPET in their pre Vista BIOSes.
+Replace the old "for all of nvidia" quirk with a quirk containing pci device
+ID. I goobled this list together from pci.ids and googling and it may be incomplete.
+
+I'm still not 100% sure the list is correct, but the only way
+to find out is to do testing in mainline. So let's do that.
+
+Signed-off-by: Andi Kleen
+
+---
+ arch/x86_64/kernel/early-quirks.c | 50 ++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 26 deletions(-)
+
+Index: linux/arch/x86_64/kernel/early-quirks.c
+===================================================================
+--- linux.orig/arch/x86_64/kernel/early-quirks.c
++++ linux/arch/x86_64/kernel/early-quirks.c
+@@ -33,36 +33,20 @@ static void __init via_bugs(void)
+ #endif
+ }
+
+-#ifdef CONFIG_ACPI
+-
+-static int __init nvidia_hpet_check(struct acpi_table_header *header)
+-{
+- return 0;
+-}
+-#endif
+-
+ static void __init nvidia_bugs(void)
+ {
+ #ifdef CONFIG_ACPI
+ #ifdef CONFIG_X86_IO_APIC
+ /*
+- * All timer overrides on Nvidia are
+- * wrong unless HPET is enabled.
+- * Unfortunately that's not true on many Asus boards.
+- * We don't know yet how to detect this automatically, but
+- * at least allow a command line override.
++ * All timer overrides on Nvidia NF3/NF4 are
++ * wrong.
+ */
+ if (acpi_use_timer_override)
+ return;
+
+- if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) {
+- acpi_skip_timer_override = 1;
+- printk(KERN_INFO "Nvidia board "
+- "detected. Ignoring ACPI "
+- "timer override.\n");
+- printk(KERN_INFO "If you got timer trouble "
+- "try acpi_use_timer_override\n");
+- }
++ acpi_skip_timer_override = 1;
++ printk(KERN_INFO "Nvidia board detected. Ignoring ACPI timer override.\n");
++ printk(KERN_INFO "If you got timer trouble try acpi_use_timer_override\n");
+ #endif
+ #endif
+ /* RED-PEN skip them on mptables too? */
+@@ -83,10 +67,19 @@ static void __init ati_bugs(void)
+ struct chipset {
+ u16 vendor;
+ void (*f)(void);
++ int id;
+ };
+
+ static struct chipset early_qrk[] __initdata = {
+- { PCI_VENDOR_ID_NVIDIA, nvidia_bugs },
++ /* This list should cover at least one PCI ID from each NF3 or NF4
++ mainboard to handle a bug in their reference BIOS. May be incomplete. */
++ { PCI_VENDOR_ID_NVIDIA, nvidia_bugs, 0x00dd }, /* nforce 3 */
++ { PCI_VENDOR_ID_NVIDIA, nvidia_bugs, 0x00e1 }, /* nforce 3 */
++ { PCI_VENDOR_ID_NVIDIA, nvidia_bugs, 0x00ed }, /* nforce 3 */
++ { PCI_VENDOR_ID_NVIDIA, nvidia_bugs, 0x003d }, /* mcp 04 ?? */
++ { PCI_VENDOR_ID_NVIDIA, nvidia_bugs, 0x005c }, /* ck 804 */
++ { PCI_VENDOR_ID_NVIDIA, nvidia_bugs, 0x026f }, /* mcp 51 / nf4 ? */
++ { PCI_VENDOR_ID_NVIDIA, nvidia_bugs, 0x02f0 }, /* mcp 51 / nf4 ? */
+ { PCI_VENDOR_ID_VIA, via_bugs },
+ { PCI_VENDOR_ID_ATI, ati_bugs },
+ {}
+@@ -99,12 +92,13 @@ void __init early_quirks(void)
+ if (!early_pci_allowed())
+ return;
+
+- /* Poor man's PCI discovery */
++ /* Poor man's PCI discovery.
++ We just look for a chipset unique PCI bridge; not scan all devices */
+ for (num = 0; num < 32; num++) {
+ for (slot = 0; slot < 32; slot++) {
+ for (func = 0; func < 8; func++) {
+ u32 class;
+- u32 vendor;
++ u32 vendor, device;
+ u8 type;
+ int i;
+ class = read_pci_config(num,slot,func,
+@@ -117,13 +111,17 @@ void __init early_quirks(void)
+
+ vendor = read_pci_config(num, slot, func,
+ PCI_VENDOR_ID);
++ device = vendor >> 16;
++
+ vendor &= 0xffff;
+
+- for (i = 0; early_qrk[i].f; i++)
+- if (early_qrk[i].vendor == vendor) {
++ for (i = 0; early_qrk[i].f; i++) {
++ struct chipset *c = &early_qrk[i];
++ if (c->vendor == vendor && (!c->id || (c->id && c->id==device))) {
+ early_qrk[i].f();
+ return;
+ }
++ }
+
+ type = read_pci_config_byte(num, slot, func,
+ PCI_HEADER_TYPE);
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-ahci-no-pmp.patch new/patches.drivers/libata-ahci-no-pmp.patch
--- old/patches.drivers/libata-ahci-no-pmp.patch 2007-08-14 08:40:43.000000000 +0200
+++ new/patches.drivers/libata-ahci-no-pmp.patch 2007-08-15 09:38:40.000000000 +0200
@@ -9,8 +9,8 @@
Signed-off-by: Tejun Heo
---
- drivers/ata/ahci.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ drivers/ata/ahci.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
Index: linux-2.6.22/drivers/ata/ahci.c
===================================================================
@@ -24,6 +24,15 @@
/* ap->flags bits */
+@@ -373,7 +374,7 @@ static const struct ata_port_info ahci_p
+ },
+ /* board_ahci_vt8251 */
+ {
+- AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ),
++ AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP),
+ .flags = AHCI_FLAG_COMMON,
+ .link_flags = AHCI_LFLAG_COMMON | ATA_LFLAG_HRST_TO_RESUME,
+ .pio_mask = 0x1f, /* pio0-4 */
@@ -392,7 +393,7 @@ static const struct ata_port_info ahci_p
/* board_ahci_sb600 */
{
++++++ patches.fixes.tar.bz2 ++++++
++++++ patches.kernel.org.tar.bz2 ++++++
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.rt.tar.bz2 ++++++
++++++ patches.suse.tar.bz2 ++++++
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
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-06-05 16:19:27.000000000 +0200
+++ new/patches.xen/xen3-auto-arch-i386.diff 2007-08-15 15:53:12.000000000 +0200
@@ -3,11 +3,11 @@
Patch-mainline: obsolete
Acked-by: jbeulich@novell.com
-Index: head-2007-05-31/arch/i386/kernel/acpi/Makefile
+Index: linux-2.6.22/arch/i386/kernel/acpi/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/acpi/Makefile 2007-04-26 05:08:32.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/acpi/Makefile 2007-05-31 14:23:39.000000000 +0200
-@@ -8,3 +8,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
+--- linux-2.6.22.orig/arch/i386/kernel/acpi/Makefile
++++ linux-2.6.22/arch/i386/kernel/acpi/Makefile
+@@ -5,3 +5,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -15,10 +15,10 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-Index: head-2007-05-31/arch/i386/kernel/asm-offsets.c
+Index: linux-2.6.22/arch/i386/kernel/asm-offsets.c
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/asm-offsets.c 2007-05-31 12:24:45.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/asm-offsets.c 2007-05-31 14:25:35.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/asm-offsets.c
++++ linux-2.6.22/arch/i386/kernel/asm-offsets.c
@@ -92,9 +92,14 @@ void foo(void)
OFFSET(pbe_orig_address, pbe, orig_address);
OFFSET(pbe_next, pbe, next);
@@ -35,10 +35,10 @@
DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
-Index: head-2007-05-31/arch/i386/kernel/cpu/Makefile
+Index: linux-2.6.22/arch/i386/kernel/cpu/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/cpu/Makefile 2007-05-31 12:24:45.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/cpu/Makefile 2007-05-31 14:26:31.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/cpu/Makefile
++++ linux-2.6.22/arch/i386/kernel/cpu/Makefile
@@ -19,3 +19,8 @@ obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
@@ -48,10 +48,10 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-Index: head-2007-05-31/arch/i386/kernel/cpu/mtrr/Makefile
+Index: linux-2.6.22/arch/i386/kernel/cpu/mtrr/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/cpu/mtrr/Makefile 2007-04-26 05:08:32.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/cpu/mtrr/Makefile 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/cpu/mtrr/Makefile
++++ linux-2.6.22/arch/i386/kernel/cpu/mtrr/Makefile
@@ -1,3 +1,10 @@
obj-y := main.o if.o generic.o state.o
obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o
@@ -63,10 +63,10 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-Index: head-2007-05-31/arch/i386/kernel/crash.c
+Index: linux-2.6.22/arch/i386/kernel/crash.c
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/crash.c 2007-05-31 12:24:45.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/crash.c 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/crash.c
++++ linux-2.6.22/arch/i386/kernel/crash.c
@@ -31,6 +31,7 @@
/* This keeps a track of which one is crashing cpu. */
static int crashing_cpu;
@@ -96,10 +96,10 @@
+#endif /* CONFIG_XEN */
crash_save_cpu(regs, safe_smp_processor_id());
}
-Index: head-2007-05-31/arch/i386/kernel/machine_kexec.c
+Index: linux-2.6.22/arch/i386/kernel/machine_kexec.c
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/machine_kexec.c 2007-05-31 13:14:03.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/machine_kexec.c 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/machine_kexec.c
++++ linux-2.6.22/arch/i386/kernel/machine_kexec.c
@@ -20,6 +20,10 @@
#include
#include
@@ -168,11 +168,11 @@
/* crashkernel=size@addr specifies the location to reserve for
* a crash kernel. By reserving this memory we guarantee
-Index: head-2007-05-31/arch/i386/kernel/Makefile
+Index: linux-2.6.22/arch/i386/kernel/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/Makefile 2007-05-31 12:24:45.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/Makefile 2007-05-31 14:23:39.000000000 +0200
-@@ -47,6 +47,12 @@ obj-y += pcspeaker.o
+--- linux-2.6.22.orig/arch/i386/kernel/Makefile
++++ linux-2.6.22/arch/i386/kernel/Makefile
+@@ -48,6 +48,12 @@ obj-y += pcspeaker.o
obj-$(CONFIG_SCx200) += scx200.o
@@ -185,7 +185,7 @@
# vsyscall.o contains the vsyscall DSO images as __initdata.
# We must build both images before we can assemble it.
# Note: kbuild does not track this dependency due to usage of .incbin
-@@ -68,7 +74,7 @@ SYSCFLAGS_vsyscall-int80.so = $(vsyscall
+@@ -69,7 +75,7 @@ SYSCFLAGS_vsyscall-int80.so = $(vsyscall
$(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
$(obj)/vsyscall-%.so: $(src)/vsyscall.lds \
@@ -194,7 +194,7 @@
$(call if_changed,syscall)
# We also create a special relocatable object that should mirror the symbol
-@@ -80,9 +86,21 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
+@@ -81,10 +87,22 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
SYSCFLAGS_vsyscall-syms.o = -r
$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
@@ -204,6 +204,7 @@
k8-y += ../../x86_64/kernel/k8.o
stacktrace-y += ../../x86_64/kernel/stacktrace.o
+ early-quirks-y += ../../x86_64/kernel/early-quirks.o
+ifdef CONFIG_XEN
+include $(srctree)/scripts/Makefile.xen
@@ -217,10 +218,10 @@
+extra-y := $(call cherrypickxen, $(extra-y))
+%/head-xen.o %/head-xen.s: EXTRA_AFLAGS :=
+endif
-Index: head-2007-05-31/arch/i386/kernel/sysenter.c
+Index: linux-2.6.22/arch/i386/kernel/sysenter.c
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/sysenter.c 2007-05-31 12:24:45.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/sysenter.c 2007-05-31 14:32:40.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/sysenter.c
++++ linux-2.6.22/arch/i386/kernel/sysenter.c
@@ -37,6 +37,10 @@ enum {
#define VDSO_DEFAULT VDSO_ENABLED
#endif
@@ -267,10 +268,10 @@
gate_vma_init();
printk("Compat vDSO mapped to %08lx.\n", __fix_to_virt(FIX_VDSO));
-Index: head-2007-05-31/arch/i386/kernel/vm86.c
+Index: linux-2.6.22/arch/i386/kernel/vm86.c
===================================================================
---- head-2007-05-31.orig/arch/i386/kernel/vm86.c 2007-05-31 12:24:45.000000000 +0200
-+++ head-2007-05-31/arch/i386/kernel/vm86.c 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/vm86.c
++++ linux-2.6.22/arch/i386/kernel/vm86.c
@@ -125,7 +125,9 @@ static int copy_vm86_regs_from_user(stru
struct pt_regs * FASTCALL(save_v86_state(struct kernel_vm86_regs * regs));
struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
@@ -325,10 +326,10 @@
tsk->thread.screen_bitmap = info->screen_bitmap;
if (info->flags & VM86_SCREEN_BITMAP)
-Index: head-2007-05-31/arch/i386/Makefile
+Index: linux-2.6.22/arch/i386/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/Makefile 2007-05-31 12:25:58.000000000 +0200
-+++ head-2007-05-31/arch/i386/Makefile 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/Makefile
++++ linux-2.6.22/arch/i386/Makefile
@@ -60,6 +60,11 @@ AFLAGS += $(call as-instr,.cfi_startproc
CFLAGS += $(cflags-y)
@@ -385,10 +386,10 @@
arch/$(ARCH)/boot/image.iso \
arch/$(ARCH)/boot/mtools.conf
+CLEAN_FILES += vmlinuz vmlinux-stripped
-Index: head-2007-05-31/arch/i386/mm/Makefile
+Index: linux-2.6.22/arch/i386/mm/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/mm/Makefile 2007-04-26 05:08:32.000000000 +0200
-+++ head-2007-05-31/arch/i386/mm/Makefile 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/mm/Makefile
++++ linux-2.6.22/arch/i386/mm/Makefile
@@ -8,3 +8,11 @@ obj-$(CONFIG_NUMA) += discontig.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_HIGHMEM) += highmem.o
@@ -401,10 +402,10 @@
+
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-Index: head-2007-05-31/arch/i386/oprofile/Makefile
+Index: linux-2.6.22/arch/i386/oprofile/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/oprofile/Makefile 2007-04-26 05:08:32.000000000 +0200
-+++ head-2007-05-31/arch/i386/oprofile/Makefile 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/oprofile/Makefile
++++ linux-2.6.22/arch/i386/oprofile/Makefile
@@ -6,7 +6,14 @@ DRIVER_OBJS = $(addprefix ../../../drive
oprofilefs.o oprofile_stats.o \
timer_int.o )
@@ -420,10 +421,10 @@
op_model_ppro.o op_model_p4.o
oprofile-$(CONFIG_X86_IO_APIC) += nmi_timer_int.o
+endif
-Index: head-2007-05-31/arch/i386/pci/Makefile
+Index: linux-2.6.22/arch/i386/pci/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/pci/Makefile 2007-04-26 05:08:32.000000000 +0200
-+++ head-2007-05-31/arch/i386/pci/Makefile 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/pci/Makefile
++++ linux-2.6.22/arch/i386/pci/Makefile
@@ -4,6 +4,10 @@ obj-$(CONFIG_PCI_BIOS) += pcbios.o
obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o mmconfig-shared.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
@@ -444,20 +445,20 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-Index: head-2007-05-31/arch/i386/power/Makefile
+Index: linux-2.6.22/arch/i386/power/Makefile
===================================================================
---- head-2007-05-31.orig/arch/i386/power/Makefile 2007-04-26 05:08:32.000000000 +0200
-+++ head-2007-05-31/arch/i386/power/Makefile 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/power/Makefile
++++ linux-2.6.22/arch/i386/power/Makefile
@@ -1,2 +1,4 @@
-obj-$(CONFIG_PM) += cpu.o
+obj-$(CONFIG_PM_LEGACY) += cpu.o
+obj-$(CONFIG_SOFTWARE_SUSPEND) += cpu.o
+obj-$(CONFIG_ACPI_SLEEP) += cpu.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o
-Index: head-2007-05-31/include/asm-i386/apic.h
+Index: linux-2.6.22/include/asm-i386/apic.h
===================================================================
---- head-2007-05-31.orig/include/asm-i386/apic.h 2007-05-31 12:25:38.000000000 +0200
-+++ head-2007-05-31/include/asm-i386/apic.h 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/include/asm-i386/apic.h
++++ linux-2.6.22/include/asm-i386/apic.h
@@ -111,7 +111,9 @@ extern int APIC_init_uniprocessor (void)
extern void enable_NMI_through_LVT0 (void * dummy);
@@ -468,10 +469,10 @@
extern int timer_over_8254;
extern int local_apic_timer_c2_ok;
-Index: head-2007-05-31/include/asm-i386/kexec.h
+Index: linux-2.6.22/include/asm-i386/kexec.h
===================================================================
---- head-2007-05-31.orig/include/asm-i386/kexec.h 2007-05-31 12:25:38.000000000 +0200
-+++ head-2007-05-31/include/asm-i386/kexec.h 2007-05-31 14:23:39.000000000 +0200
+--- linux-2.6.22.orig/include/asm-i386/kexec.h
++++ linux-2.6.22/include/asm-i386/kexec.h
@@ -94,6 +94,20 @@ relocate_kernel(unsigned long indirectio
unsigned long start_address,
unsigned int has_pae) ATTRIB_NORET;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-x86-early-quirks-unificiation new/patches.xen/xen3-x86-early-quirks-unificiation
--- old/patches.xen/xen3-x86-early-quirks-unificiation 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.xen/xen3-x86-early-quirks-unificiation 2007-08-15 15:16:43.000000000 +0200
@@ -0,0 +1,25 @@
+Subject: x86: Unify i386 and x86-64 early quirks
+
+They were already very similar; just use the same file now.
+
+Cc: lenb@kernel.org
+
+Signed-off-by: Andi Kleen
+
+Automatically created from "patches.arch/x86-early-quirks-unificiation" by xen-port-patches.py
+
+Index: linux-2.6.22/arch/i386/kernel/setup-xen.c
+===================================================================
+--- linux-2.6.22.orig/arch/i386/kernel/setup-xen.c
++++ linux-2.6.22/arch/i386/kernel/setup-xen.c
+@@ -627,9 +627,7 @@ void __init setup_arch(char **cmdline_p)
+ #endif
+
+ #ifdef CONFIG_PCI
+-#ifdef CONFIG_X86_IO_APIC
+- check_acpi_pci(); /* Checks more than just ACPI actually */
+-#endif
++ early_quirks();
+ #endif
+
+ #ifdef CONFIG_ACPI
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-x86-fam10-l3cache new/patches.xen/xen3-x86-fam10-l3cache
--- old/patches.xen/xen3-x86-fam10-l3cache 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.xen/xen3-x86-fam10-l3cache 2007-08-15 15:16:43.000000000 +0200
@@ -0,0 +1,28 @@
+Subject: i386: Add L3 cache support to AMD CPUID4 emulation
+
+With that an L3 cache is correctly reported in the cache information in /sys
+
+With fixes from Andreas Herrmann and Dean Gaudet and Joachim Deguara
+
+Signed-off-by: Andi Kleen
+
+Automatically created from "patches.arch/x86-fam10-l3cache" by xen-port-patches.py
+
+Index: linux/arch/x86_64/kernel/setup-xen.c
+===================================================================
+--- linux.orig/arch/x86_64/kernel/setup-xen.c
++++ linux/arch/x86_64/kernel/setup-xen.c
+@@ -602,8 +602,11 @@ static void __cpuinit init_amd(struct cp
+ if (c->extended_cpuid_level >= 0x80000008)
+ amd_detect_cmp(c);
+
+- /* Fix cpuid4 emulation for more */
+- num_cache_leaves = 3;
++ if (c->extended_cpuid_level >= 0x80000006 &&
++ (cpuid_edx(0x80000006) & 0xf000))
++ num_cache_leaves = 4;
++ else
++ num_cache_leaves = 3;
+
+ /* RDTSC can be speculated around */
+ clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
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-07-12 14:52:16.000000000 +0200
+++ new/patches.xen/xen-x86-no-lapic 2007-08-15 15:53:12.000000000 +0200
@@ -3,10 +3,10 @@
Patch-mainline: obsolete
References: 191115
-Index: head-2007-07-10/arch/i386/kernel/acpi/boot-xen.c
+Index: linux-2.6.22/arch/i386/kernel/acpi/boot-xen.c
===================================================================
---- head-2007-07-10.orig/arch/i386/kernel/acpi/boot-xen.c 2007-07-10 11:16:17.000000000 +0200
-+++ head-2007-07-10/arch/i386/kernel/acpi/boot-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/acpi/boot-xen.c
++++ linux-2.6.22/arch/i386/kernel/acpi/boot-xen.c
@@ -85,7 +85,7 @@ int acpi_sci_override_gsi __initdata;
int acpi_skip_timer_override __initdata;
int acpi_use_timer_override __initdata;
@@ -57,39 +57,10 @@
count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC, acpi_parse_lapic,
MAX_APICS);
-Index: head-2007-07-10/arch/i386/kernel/acpi/earlyquirk.c
+Index: linux-2.6.22/arch/i386/kernel/apic-xen.c
===================================================================
---- head-2007-07-10.orig/arch/i386/kernel/acpi/earlyquirk.c 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/arch/i386/kernel/acpi/earlyquirk.c 2007-07-10 11:19:11.000000000 +0200
-@@ -11,7 +11,7 @@
- #include
- #include
-
--#ifdef CONFIG_ACPI
-+#if defined(CONFIG_ACPI) && !defined(CONFIG_XEN)
-
- static int __init nvidia_hpet_check(struct acpi_table_header *header)
- {
-@@ -21,6 +21,7 @@ static int __init nvidia_hpet_check(stru
-
- static int __init check_bridge(int vendor, int device)
- {
-+#ifndef CONFIG_XEN
- #ifdef CONFIG_ACPI
- static int warned;
- /* According to Nvidia all timer overrides are bogus unless HPET
-@@ -44,6 +45,7 @@ static int __init check_bridge(int vendo
- printk(KERN_INFO "ATI board detected. Disabling timer routing "
- "over 8254.\n");
- }
-+#endif
- return 0;
- }
-
-Index: head-2007-07-10/arch/i386/kernel/apic-xen.c
-===================================================================
---- head-2007-07-10.orig/arch/i386/kernel/apic-xen.c 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/arch/i386/kernel/apic-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/apic-xen.c
++++ linux-2.6.22/arch/i386/kernel/apic-xen.c
@@ -1,81 +1,37 @@
/*
- * Local APIC handling, local APIC timers
@@ -190,10 +161,10 @@
int setup_profiling_timer(unsigned int multiplier)
{
-Index: head-2007-07-10/arch/i386/kernel/io_apic-xen.c
+Index: linux-2.6.22/arch/i386/kernel/io_apic-xen.c
===================================================================
---- head-2007-07-10.orig/arch/i386/kernel/io_apic-xen.c 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/arch/i386/kernel/io_apic-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/io_apic-xen.c
++++ linux-2.6.22/arch/i386/kernel/io_apic-xen.c
@@ -73,7 +73,9 @@ static struct { int pin, apic; } ioapic_
static DEFINE_SPINLOCK(ioapic_lock);
static DEFINE_SPINLOCK(vector_lock);
@@ -246,10 +217,10 @@
static int __init parse_noapic(char *arg)
{
-Index: head-2007-07-10/arch/i386/kernel/mpparse-xen.c
+Index: linux-2.6.22/arch/i386/kernel/mpparse-xen.c
===================================================================
---- head-2007-07-10.orig/arch/i386/kernel/mpparse-xen.c 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/arch/i386/kernel/mpparse-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/mpparse-xen.c
++++ linux-2.6.22/arch/i386/kernel/mpparse-xen.c
@@ -61,7 +61,9 @@ int mp_irq_entries;
int nr_ioapics;
@@ -323,10 +294,10 @@
tmpid = id;
if (tmpid == -1) {
nr_ioapics--;
-Index: head-2007-07-10/arch/i386/kernel/smp-xen.c
+Index: linux-2.6.22/arch/i386/kernel/smp-xen.c
===================================================================
---- head-2007-07-10.orig/arch/i386/kernel/smp-xen.c 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/arch/i386/kernel/smp-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/i386/kernel/smp-xen.c
++++ linux-2.6.22/arch/i386/kernel/smp-xen.c
@@ -114,6 +114,7 @@ DEFINE_PER_CPU(struct tlb_state, cpu_tlb
* We use 'broadcast', CPU->CPU IPIs and self-IPIs too.
*/
@@ -343,10 +314,10 @@
DECLARE_PER_CPU(int, ipi_to_irq[NR_IPIS]);
-Index: head-2007-07-10/arch/x86_64/kernel/Makefile
+Index: linux-2.6.22/arch/x86_64/kernel/Makefile
===================================================================
---- head-2007-07-10.orig/arch/x86_64/kernel/Makefile 2007-07-10 11:19:09.000000000 +0200
-+++ head-2007-07-10/arch/x86_64/kernel/Makefile 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/x86_64/kernel/Makefile
++++ linux-2.6.22/arch/x86_64/kernel/Makefile
@@ -65,12 +65,14 @@ pcspeaker-y += ../../i386/kernel/pcspe
perfctr-watchdog-y += ../../i386/kernel/cpu/perfctr-watchdog.o
@@ -363,10 +334,10 @@
include $(srctree)/scripts/Makefile.xen
-Index: head-2007-07-10/arch/x86_64/kernel/apic-xen.c
+Index: linux-2.6.22/arch/x86_64/kernel/apic-xen.c
===================================================================
---- head-2007-07-10.orig/arch/x86_64/kernel/apic-xen.c 2007-07-10 11:14:07.000000000 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- linux-2.6.22.orig/arch/x86_64/kernel/apic-xen.c
++++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Local APIC handling, local APIC timers
@@ -566,10 +537,10 @@
-
- return 1;
-}
-Index: head-2007-07-10/arch/x86_64/kernel/genapic-xen.c
+Index: linux-2.6.22/arch/x86_64/kernel/genapic-xen.c
===================================================================
---- head-2007-07-10.orig/arch/x86_64/kernel/genapic-xen.c 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/arch/x86_64/kernel/genapic-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/x86_64/kernel/genapic-xen.c
++++ linux-2.6.22/arch/x86_64/kernel/genapic-xen.c
@@ -17,7 +17,6 @@
#include
@@ -595,10 +566,10 @@
+ xen_send_IPI_shortcut(APIC_DEST_SELF, vector);
#endif
}
-Index: head-2007-07-10/arch/x86_64/kernel/genapic_xen.c
+Index: linux-2.6.22/arch/x86_64/kernel/genapic_xen.c
===================================================================
---- head-2007-07-10.orig/arch/x86_64/kernel/genapic_xen.c 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/arch/x86_64/kernel/genapic_xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/x86_64/kernel/genapic_xen.c
++++ linux-2.6.22/arch/x86_64/kernel/genapic_xen.c
@@ -18,7 +18,6 @@
#include
#ifdef CONFIG_XEN_PRIVILEGED_GUEST
@@ -641,10 +612,10 @@
.target_cpus = xen_target_cpus,
.vector_allocation_domain = xen_vector_allocation_domain,
#ifdef CONFIG_XEN_PRIVILEGED_GUEST
-Index: head-2007-07-10/arch/x86_64/kernel/io_apic-xen.c
+Index: linux-2.6.22/arch/x86_64/kernel/io_apic-xen.c
===================================================================
---- head-2007-07-10.orig/arch/x86_64/kernel/io_apic-xen.c 2007-07-10 11:16:14.000000000 +0200
-+++ head-2007-07-10/arch/x86_64/kernel/io_apic-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/x86_64/kernel/io_apic-xen.c
++++ linux-2.6.22/arch/x86_64/kernel/io_apic-xen.c
@@ -66,10 +66,6 @@ static int assign_irq_vector(int irq, cp
int sis_apic_bug; /* not actually supported, dummy for compile */
@@ -705,10 +676,10 @@
/*
*
-Index: head-2007-07-10/arch/x86_64/kernel/mpparse-xen.c
+Index: linux-2.6.22/arch/x86_64/kernel/mpparse-xen.c
===================================================================
---- head-2007-07-10.orig/arch/x86_64/kernel/mpparse-xen.c 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/arch/x86_64/kernel/mpparse-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/x86_64/kernel/mpparse-xen.c
++++ linux-2.6.22/arch/x86_64/kernel/mpparse-xen.c
@@ -52,8 +52,9 @@ struct mpc_config_intsrc mp_irqs[MAX_IRQ
int mp_irq_entries;
@@ -765,10 +736,10 @@
void __cpuinit mp_register_lapic (u8 id, u8 enabled)
{
-Index: head-2007-07-10/arch/x86_64/kernel/traps-xen.c
+Index: linux-2.6.22/arch/x86_64/kernel/traps-xen.c
===================================================================
---- head-2007-07-10.orig/arch/x86_64/kernel/traps-xen.c 2007-07-10 11:19:09.000000000 +0200
-+++ head-2007-07-10/arch/x86_64/kernel/traps-xen.c 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/arch/x86_64/kernel/traps-xen.c
++++ linux-2.6.22/arch/x86_64/kernel/traps-xen.c
@@ -1051,15 +1051,15 @@ asmlinkage void do_spurious_interrupt_bu
{
}
@@ -787,10 +758,10 @@
/*
* 'math_state_restore()' saves the current math information in the
-Index: head-2007-07-10/include/asm-i386/apic.h
+Index: linux-2.6.22/include/asm-i386/apic.h
===================================================================
---- head-2007-07-10.orig/include/asm-i386/apic.h 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/include/asm-i386/apic.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-i386/apic.h
++++ linux-2.6.22/include/asm-i386/apic.h
@@ -3,7 +3,9 @@
#include
@@ -833,10 +804,10 @@
#endif /* !CONFIG_X86_LOCAL_APIC */
#endif /* __ASM_APIC_H */
-Index: head-2007-07-10/include/asm-i386/apicdef.h
+Index: linux-2.6.22/include/asm-i386/apicdef.h
===================================================================
---- head-2007-07-10.orig/include/asm-i386/apicdef.h 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/include/asm-i386/apicdef.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-i386/apicdef.h
++++ linux-2.6.22/include/asm-i386/apicdef.h
@@ -1,6 +1,8 @@
#ifndef __ASM_APICDEF_H
#define __ASM_APICDEF_H
@@ -874,10 +845,10 @@
+#endif /* CONFIG_XEN */
+
#endif
-Index: head-2007-07-10/include/asm-i386/mach-xen/asm/fixmap.h
+Index: linux-2.6.22/include/asm-i386/mach-xen/asm/fixmap.h
===================================================================
---- head-2007-07-10.orig/include/asm-i386/mach-xen/asm/fixmap.h 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/include/asm-i386/mach-xen/asm/fixmap.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-i386/mach-xen/asm/fixmap.h
++++ linux-2.6.22/include/asm-i386/mach-xen/asm/fixmap.h
@@ -53,13 +53,15 @@ extern unsigned long __FIXADDR_TOP;
enum fixed_addresses {
FIX_HOLE,
@@ -895,10 +866,10 @@
#ifdef CONFIG_X86_VISWS_APIC
FIX_CO_CPU, /* Cobalt timer */
FIX_CO_APIC, /* Cobalt APIC Redirection Table */
-Index: head-2007-07-10/include/asm-i386/mach-xen/asm/hw_irq.h
+Index: linux-2.6.22/include/asm-i386/mach-xen/asm/hw_irq.h
===================================================================
---- head-2007-07-10.orig/include/asm-i386/mach-xen/asm/hw_irq.h 2007-07-10 11:04:27.000000000 +0200
-+++ head-2007-07-10/include/asm-i386/mach-xen/asm/hw_irq.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-i386/mach-xen/asm/hw_irq.h
++++ linux-2.6.22/include/asm-i386/mach-xen/asm/hw_irq.h
@@ -17,8 +17,6 @@
#include
#include
@@ -908,10 +879,10 @@
/*
* Various low-level irq details needed by irq.c, process.c,
* time.c, io_apic.c and smp.c
-Index: head-2007-07-10/include/asm-i386/mach-xen/asm/smp.h
+Index: linux-2.6.22/include/asm-i386/mach-xen/asm/smp.h
===================================================================
---- head-2007-07-10.orig/include/asm-i386/mach-xen/asm/smp.h 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/include/asm-i386/mach-xen/asm/smp.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-i386/mach-xen/asm/smp.h
++++ linux-2.6.22/include/asm-i386/mach-xen/asm/smp.h
@@ -156,7 +156,7 @@ extern unsigned int num_processors;
#ifndef __ASSEMBLY__
@@ -930,10 +901,10 @@
static __inline int logical_smp_processor_id(void)
{
/* we don't want to mark this access volatile - bad code generation */
-Index: head-2007-07-10/include/asm-i386/mach-xen/irq_vectors.h
+Index: linux-2.6.22/include/asm-i386/mach-xen/irq_vectors.h
===================================================================
---- head-2007-07-10.orig/include/asm-i386/mach-xen/irq_vectors.h 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/include/asm-i386/mach-xen/irq_vectors.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-i386/mach-xen/irq_vectors.h
++++ linux-2.6.22/include/asm-i386/mach-xen/irq_vectors.h
@@ -34,7 +34,7 @@
* Vectors 0x20-0x2f are used for ISA interrupts.
*/
@@ -959,10 +930,10 @@
#define RESCHEDULE_VECTOR 0
#define CALL_FUNCTION_VECTOR 1
-Index: head-2007-07-10/include/asm-i386/mach-xen/mach_apic.h
+Index: linux-2.6.22/include/asm-i386/mach-xen/mach_apic.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2007-07-10/include/asm-i386/mach-xen/mach_apic.h 2007-07-10 11:19:11.000000000 +0200
+--- /dev/null
++++ linux-2.6.22/include/asm-i386/mach-xen/mach_apic.h
@@ -0,0 +1,44 @@
+#ifndef __ASM_MACH_APIC_H
+#define __ASM_MACH_APIC_H
@@ -1008,10 +979,10 @@
+}
+
+#endif /* __ASM_MACH_APIC_H */
-Index: head-2007-07-10/include/asm-x86_64/apic.h
+Index: linux-2.6.22/include/asm-x86_64/apic.h
===================================================================
---- head-2007-07-10.orig/include/asm-x86_64/apic.h 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/include/asm-x86_64/apic.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-x86_64/apic.h
++++ linux-2.6.22/include/asm-x86_64/apic.h
@@ -3,7 +3,9 @@
#include
@@ -1052,10 +1023,10 @@
extern unsigned boot_cpu_id;
extern int local_apic_timer_c2_ok;
-Index: head-2007-07-10/include/asm-x86_64/apicdef.h
+Index: linux-2.6.22/include/asm-x86_64/apicdef.h
===================================================================
---- head-2007-07-10.orig/include/asm-x86_64/apicdef.h 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/include/asm-x86_64/apicdef.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-x86_64/apicdef.h
++++ linux-2.6.22/include/asm-x86_64/apicdef.h
@@ -1,6 +1,8 @@
#ifndef __ASM_APICDEF_H
#define __ASM_APICDEF_H
@@ -1097,11 +1068,11 @@
#define BAD_APICID 0xFFu
#endif
-Index: head-2007-07-10/include/asm-x86_64/io_apic.h
+Index: linux-2.6.22/include/asm-x86_64/io_apic.h
===================================================================
---- head-2007-07-10.orig/include/asm-x86_64/io_apic.h 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/include/asm-x86_64/io_apic.h 2007-07-10 11:19:11.000000000 +0200
-@@ -125,6 +125,8 @@ extern int sis_apic_bug; /* dummy */
+--- linux-2.6.22.orig/include/asm-x86_64/io_apic.h
++++ linux-2.6.22/include/asm-x86_64/io_apic.h
+@@ -125,7 +125,9 @@ extern int sis_apic_bug; /* dummy */
void enable_NMI_through_LVT0 (void * dummy);
@@ -1109,11 +1080,12 @@
extern spinlock_t i8259A_lock;
+#endif
- #endif
-Index: head-2007-07-10/include/asm-x86_64/ipi.h
+ extern int timer_over_8254;
+
+Index: linux-2.6.22/include/asm-x86_64/ipi.h
===================================================================
---- head-2007-07-10.orig/include/asm-x86_64/ipi.h 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/include/asm-x86_64/ipi.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-x86_64/ipi.h
++++ linux-2.6.22/include/asm-x86_64/ipi.h
@@ -1,6 +1,8 @@
#ifndef __ASM_IPI_H
#define __ASM_IPI_H
@@ -1130,10 +1102,10 @@
+#endif /* CONFIG_XEN */
+
#endif /* __ASM_IPI_H */
-Index: head-2007-07-10/include/asm-x86_64/mach-xen/asm/fixmap.h
+Index: linux-2.6.22/include/asm-x86_64/mach-xen/asm/fixmap.h
===================================================================
---- head-2007-07-10.orig/include/asm-x86_64/mach-xen/asm/fixmap.h 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/include/asm-x86_64/mach-xen/asm/fixmap.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-x86_64/mach-xen/asm/fixmap.h
++++ linux-2.6.22/include/asm-x86_64/mach-xen/asm/fixmap.h
@@ -12,7 +12,6 @@
#define _ASM_FIXMAP_H
@@ -1154,10 +1126,10 @@
FIX_IO_APIC_BASE_0,
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
#endif
-Index: head-2007-07-10/include/asm-x86_64/mach-xen/asm/hw_irq.h
+Index: linux-2.6.22/include/asm-x86_64/mach-xen/asm/hw_irq.h
===================================================================
---- head-2007-07-10.orig/include/asm-x86_64/mach-xen/asm/hw_irq.h 2007-07-10 11:09:47.000000000 +0200
-+++ head-2007-07-10/include/asm-x86_64/mach-xen/asm/hw_irq.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-x86_64/mach-xen/asm/hw_irq.h
++++ linux-2.6.22/include/asm-x86_64/mach-xen/asm/hw_irq.h
@@ -22,7 +22,6 @@
#include
#endif
@@ -1166,10 +1138,10 @@
/*
* IDT vectors usable for external interrupt sources start
* at 0x20:
-Index: head-2007-07-10/include/asm-x86_64/mach-xen/asm/smp.h
+Index: linux-2.6.22/include/asm-x86_64/mach-xen/asm/smp.h
===================================================================
---- head-2007-07-10.orig/include/asm-x86_64/mach-xen/asm/smp.h 2007-07-10 11:14:07.000000000 +0200
-+++ head-2007-07-10/include/asm-x86_64/mach-xen/asm/smp.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-x86_64/mach-xen/asm/smp.h
++++ linux-2.6.22/include/asm-x86_64/mach-xen/asm/smp.h
@@ -8,6 +8,7 @@
#include
#include
@@ -1204,10 +1176,10 @@
static __inline int logical_smp_processor_id(void)
{
/* we don't want to mark this access volatile - bad code generation */
-Index: head-2007-07-10/include/asm-x86_64/mach-xen/irq_vectors.h
+Index: linux-2.6.22/include/asm-x86_64/mach-xen/irq_vectors.h
===================================================================
---- head-2007-07-10.orig/include/asm-x86_64/mach-xen/irq_vectors.h 2007-07-10 10:42:08.000000000 +0200
-+++ head-2007-07-10/include/asm-x86_64/mach-xen/irq_vectors.h 2007-07-10 11:19:11.000000000 +0200
+--- linux-2.6.22.orig/include/asm-x86_64/mach-xen/irq_vectors.h
++++ linux-2.6.22/include/asm-x86_64/mach-xen/irq_vectors.h
@@ -4,16 +4,10 @@
*
* In addition, there are some standard defines:
@@ -1288,3 +1260,23 @@
#define RESCHEDULE_VECTOR 0
#define CALL_FUNCTION_VECTOR 1
#define NR_IPIS 2
+Index: linux-2.6.22/arch/x86_64/kernel/early-quirks.c
+===================================================================
+--- linux-2.6.22.orig/arch/x86_64/kernel/early-quirks.c
++++ linux-2.6.22/arch/x86_64/kernel/early-quirks.c
+@@ -55,6 +55,7 @@ static void __init nvidia_bugs(void)
+
+ static void __init ati_bugs(void)
+ {
++#ifndef CONFIG_XEN
+ #ifdef CONFIG_X86_IO_APIC
+ if (timer_over_8254 == 1) {
+ timer_over_8254 = 0;
+@@ -62,6 +63,7 @@ static void __init ati_bugs(void)
+ "ATI board detected. Disabling timer routing over 8254.\n");
+ }
+ #endif
++#endif
+ }
+
+ struct chipset {
++++++ series.conf ++++++
--- kernel-source/series.conf 2007-08-14 17:28:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-08-15 20:27:25.000000000 +0200
@@ -53,14 +53,20 @@
# ia64
# i386
+ patches.arch/i386-compat-vdso
# amd64 | x86-64 | x86_64
# 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T'
# x64
+ # Intel 64
# "the architecture with too many names"
+ # TAWTMN
# for i386/x86-64
-
+ patches.arch/x86-early-quirks-unificiation
+ patches.arch/x86-nvidia-timer-quirk
+ patches.arch/x86-fam10-l3cache
+
# suse s390
# numa mempolicy
@@ -774,6 +780,8 @@
-RT patches.xen/xen-x86_64-entry
-RT patches.xen/xen-intel-agp
-RT patches.xen/xen-blkback-cdrom
+-RT patches.xen/xen3-x86-early-quirks-unificiation
+-RT patches.xen/xen3-x86-fam10-l3cache
# RT
+RT patches.rt/patch-2.6.22.1-rt4.openSUSE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org