rpms/kernel-xen/devel linux-2.6-xen-acpi.patch,1.2,1.3

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Feb 9 00:07:01 UTC 2006


Author: katzj

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

Modified Files:
	linux-2.6-xen-acpi.patch 
Log Message:
missed a hunk


linux-2.6-xen-acpi.patch:
 arch/x86_64/kernel/mpparse-xen.c   |    8 ++++----
 b/arch/i386/kernel/acpi/boot-xen.c |    6 +++---
 b/arch/i386/kernel/mpparse-xen.c   |    8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: linux-2.6-xen-acpi.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-acpi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-acpi.patch	8 Feb 2006 23:34:03 -0000	1.2
+++ linux-2.6-xen-acpi.patch	9 Feb 2006 00:06:57 -0000	1.3
@@ -58,7 +58,7 @@
  }
  
 --- a/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 18:30:03.000000000 -0500
-+++ b/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 18:32:45.000000000 -0500
++++ b/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 19:06:46.000000000 -0500
 @@ -920,7 +920,7 @@
  
  #define MAX_GSI_NUM	4096
@@ -68,6 +68,15 @@
  {
  	int			ioapic = -1;
  	int			ioapic_pin = 0;
+@@ -969,7 +969,7 @@
+ 
+ 	mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
+ 
+-	if (edge_level) {
++	if (triggering == ACPI_LEVEL_SENSITIVE) {
+ 		/*
+ 		 * For PCI devices assign IRQs in order, avoiding gaps
+ 		 * due to unused I/O APIC pins.
 @@ -991,8 +991,8 @@
  	}
  




More information about the fedora-cvs-commits mailing list