rpms/kernel-xen/devel linux-2.6.14-xen-compile-fixes.patch,1.4,1.5

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Feb 11 20:20:40 UTC 2006


Author: quintela

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

Modified Files:
	linux-2.6.14-xen-compile-fixes.patch 
Log Message:
really, really fix the ack_bad_irq x86_64 xen

linux-2.6.14-xen-compile-fixes.patch:
 linux-2.6.15.new/arch/i386/mm/init-xen.c             |    1 +
 linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c    |    9 +++++++++
 linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c |   11 +++++++++++
 3 files changed, 21 insertions(+)

Index: linux-2.6.14-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6.14-xen-compile-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.14-xen-compile-fixes.patch	11 Feb 2006 20:07:30 -0000	1.4
+++ linux-2.6.14-xen-compile-fixes.patch	11 Feb 2006 20:20:36 -0000	1.5
@@ -28,3 +28,24 @@
  
  /*
   * noexec = on|off
+diff -uNp linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c
+--- linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig	2006-02-11 20:17:49.000000000 +0100
++++ linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c	2006-02-11 20:18:09.000000000 +0100
+@@ -39,6 +39,17 @@ extern struct genapic apic_xen;
+ struct genapic *genapic = &apic_xen;
+ #endif
+ 
++#ifndef CONFIG_X86_LOCAL_APIC
++/*
++ * 'what should we do if we get a hw irq event on an illegal vector'.
++ * each architecture has to answer this themselves.
++ */
++void ack_bad_irq(unsigned int irq)
++{
++        printk("unexpected IRQ trap at vector %02x\n", irq);
++}
++#endif
++
+ 
+ /*
+  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.




More information about the fedora-cvs-commits mailing list