ia64/xen-unstable

changeset 5109:1e4b308becce

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>
author vh249@arcadians.cl.cam.ac.uk
date Tue May 24 00:09:33 2005 +0000 (2005-05-24)
parents 3f1fa7551ce9
children bb7d7790594e
files patches/linux-2.6.11/x86_64-linux.patch
line diff
     1.1 --- a/patches/linux-2.6.11/x86_64-linux.patch	Mon May 23 23:05:32 2005 +0000
     1.2 +++ b/patches/linux-2.6.11/x86_64-linux.patch	Tue May 24 00:09:33 2005 +0000
     1.3 @@ -5,7 +5,7 @@ diff -urN linux-2.6.10-orig/include/asm-
     1.4    *
     1.5    *  Vectors 0xf0-0xf9 are free (reserved for future Linux use).
     1.6    */
     1.7 -+#if 0
     1.8 ++#ifndef CONFIG_XEN
     1.9   #define SPURIOUS_APIC_VECTOR	0xff
    1.10   #define ERROR_APIC_VECTOR	0xfe
    1.11   #define INVALIDATE_TLB_VECTOR	0xfd
    1.12 @@ -21,23 +21,25 @@ diff -urN linux-2.6.10-orig/include/asm-
    1.13  diff -urN linux-2.6.10-orig/include/asm-x86_64/irq.h linux-2.6.10/include/asm-x86_64/irq.h
    1.14  --- linux-2.6.10-orig/include/asm-x86_64/irq.h	2005-01-06 00:34:38.000000000 -0500
    1.15  +++ linux-2.6.10/include/asm-x86_64/irq.h	2005-02-25 17:45:37.181518088 -0500
    1.16 -@@ -10,6 +10,7 @@
    1.17 +@@ -10,6 +10,9 @@
    1.18    *	<tomsoft@informatik.tu-chemnitz.de>
    1.19    */
    1.20   
    1.21 ++#ifdef CONFIG_XEN
    1.22  +#include "irq_vectors.h"
    1.23 ++#endif
    1.24   #define TIMER_IRQ 0
    1.25   
    1.26   /*
    1.27 -@@ -22,6 +23,7 @@
    1.28 +@@ -22,6 +25,7 @@
    1.29    * the usable vector space is 0x20-0xff (224 vectors)
    1.30    */
    1.31   
    1.32 -+#if 0
    1.33 ++#ifndef CONFIG_XEN
    1.34   /*
    1.35    * The maximum number of vectors supported by x86_64 processors
    1.36    * is limited to 256. For processors other than x86_64, NR_VECTORS
    1.37 -@@ -38,6 +40,7 @@
    1.38 +@@ -38,6 +42,7 @@
    1.39   #define NR_IRQS 224
    1.40   #define NR_IRQ_VECTORS 1024
    1.41   #endif