rpms/kernel/devel linux-2.6-xen-disable_ati_timer_quirk.patch, NONE, 1.1 kernel-2.6.spec, 1.2037, 1.2038

[fedora-cvs-commits at redhat.com]

Author: sct

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12763

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-xen-disable_ati_timer_quirk.patch 
Log Message:
Fix conflict between Xen and ati patch from git10

linux-2.6-xen-disable_ati_timer_quirk.patch:
 linux-2.6.15.i686/arch/i386/kernel/acpi/boot-xen.c     |    3 ---
 linux-2.6.15.i686/arch/i386/kernel/setup-xen.c         |    4 ++++
 linux-2.6.15.noarch/arch/i386/kernel/acpi/earlyquirk.c |    2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-xen-disable_ati_timer_quirk.patch ---
diff -uNp linux-2.6.15.noarch/arch/i386/kernel/acpi/earlyquirk.c.orig linux-2.6.15.noarch/arch/i386/kernel/acpi/earlyquirk.c
--- linux-2.6.15.noarch/arch/i386/kernel/acpi/earlyquirk.c.orig	2006-03-09 22:57:34.000000000 +0100
+++ linux-2.6.15.noarch/arch/i386/kernel/acpi/earlyquirk.c	2006-03-09 22:57:53.000000000 +0100
@@ -18,11 +18,13 @@ static int __init check_bridge(int vendo
 		acpi_skip_timer_override = 1;
 	}
 #endif
+#ifndef CONFIG_XEN
 	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");
 	}
+#endif
 	return 0;
 }
 
--- linux-2.6.15.i686/arch/i386/kernel/acpi/boot-xen.c~	2006-03-09 16:46:08.000000000 -0500
+++ linux-2.6.15.i686/arch/i386/kernel/acpi/boot-xen.c	2006-03-09 16:58:47.000000000 -0500
@@ -1112,9 +1112,6 @@
 		disable_acpi();
 		return error;
 	}
-#ifdef __i386__
-	check_acpi_pci();
-#endif
 
 	acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
 
--- linux-2.6.15.i686/arch/i386/kernel/setup-xen.c~	2006-03-09 16:46:05.000000000 -0500
+++ linux-2.6.15.i686/arch/i386/kernel/setup-xen.c	2006-03-09 17:07:23.000000000 -0500
@@ -1819,6 +1819,10 @@
 	op.u.set_iopl.iopl = 1;
 	HYPERVISOR_physdev_op(&op);
 
+#ifdef CONFIG_X86_IO_APIC
+	check_acpi_pci();	/* Checks more than just ACPI actually */
+#endif
+
 #ifdef CONFIG_ACPI
 	if (!(xen_start_info->flags & SIF_INITDOMAIN)) {
 		printk(KERN_INFO "ACPI in unprivileged domain disabled\n");


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2037
retrieving revision 1.2038
diff -u -r1.2037 -r1.2038
--- kernel-2.6.spec	9 Mar 2006 20:54:01 -0000	1.2037
+++ kernel-2.6.spec	9 Mar 2006 22:26:24 -0000	1.2038
@@ -262,6 +262,7 @@
 Patch706: linux-2.6-xen_remap_vma_flags.patch
 Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
 Patch710: linux-2.6-xen-kva-mmap.patch
+Patch711: linux-2.6-xen-disable_ati_timer_quirk.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -814,6 +815,7 @@
 %patch706 -p1
 %patch709 -p1
 %patch710 -p2
+%patch711 -p1
 
 %endif
 
@@ -1655,6 +1657,7 @@
 * Thu Mar  9 2006 Stephen Tweedie <sct at redhat.com>
 - Disable a bunch of hardware drivers in xenU that have no business
   being built in an unprivileged guest.
+- Fix conflict between Xen and ati patch from latest git tree
 
 * Thu Mar  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5-git12/git13