diff options
| author | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-05-24 00:09:33 +0000 |
|---|---|---|
| committer | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-05-24 00:09:33 +0000 |
| commit | 3e654362f084c9f30a78766193b1c5f5b73fbaec (patch) | |
| tree | d850761e3aa68d9731c751a908fa6667cc016e64 /patches | |
| parent | 8b81154e5c954ffc17d06afc20c363b1fa627acd (diff) | |
| download | xen-3e654362f084c9f30a78766193b1c5f5b73fbaec.tar.gz xen-3e654362f084c9f30a78766193b1c5f5b73fbaec.tar.bz2 xen-3e654362f084c9f30a78766193b1c5f5b73fbaec.zip | |
bitkeeper revision 1.1520.1.1 (429270bdd9U5A9UX0aJUWkoZm4BI7g)
handfix x86_64-linux.patch to not break compilation with ARCH=x86_64
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/linux-2.6.11/x86_64-linux.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/patches/linux-2.6.11/x86_64-linux.patch b/patches/linux-2.6.11/x86_64-linux.patch index 82ab190d11..57d4f07a06 100644 --- a/patches/linux-2.6.11/x86_64-linux.patch +++ b/patches/linux-2.6.11/x86_64-linux.patch @@ -5,7 +5,7 @@ diff -urN linux-2.6.10-orig/include/asm-x86_64/hw_irq.h linux-2.6.10/include/asm * * Vectors 0xf0-0xf9 are free (reserved for future Linux use). */ -+#if 0 ++#ifndef CONFIG_XEN #define SPURIOUS_APIC_VECTOR 0xff #define ERROR_APIC_VECTOR 0xfe #define INVALIDATE_TLB_VECTOR 0xfd @@ -21,23 +21,25 @@ diff -urN linux-2.6.10-orig/include/asm-x86_64/hw_irq.h linux-2.6.10/include/asm diff -urN linux-2.6.10-orig/include/asm-x86_64/irq.h linux-2.6.10/include/asm-x86_64/irq.h --- linux-2.6.10-orig/include/asm-x86_64/irq.h 2005-01-06 00:34:38.000000000 -0500 +++ linux-2.6.10/include/asm-x86_64/irq.h 2005-02-25 17:45:37.181518088 -0500 -@@ -10,6 +10,7 @@ +@@ -10,6 +10,9 @@ * <tomsoft@informatik.tu-chemnitz.de> */ ++#ifdef CONFIG_XEN +#include "irq_vectors.h" ++#endif #define TIMER_IRQ 0 /* -@@ -22,6 +23,7 @@ +@@ -22,6 +25,7 @@ * the usable vector space is 0x20-0xff (224 vectors) */ -+#if 0 ++#ifndef CONFIG_XEN /* * The maximum number of vectors supported by x86_64 processors * is limited to 256. For processors other than x86_64, NR_VECTORS -@@ -38,6 +40,7 @@ +@@ -38,6 +42,7 @@ #define NR_IRQS 224 #define NR_IRQ_VECTORS 1024 #endif |