ia64/xen-unstable

changeset 6065:f586b9ecd474

Fix x86/64 xenlinux build. Remove stupid patch.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Mon Aug 08 14:39:29 2005 +0000 (2005-08-08)
parents d4e19aca1f72
children dcb2b7a1c621
files linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hw_irq.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hw_irq.h	Mon Aug 08 14:13:36 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hw_irq.h	Mon Aug 08 14:39:29 2005 +0000
     1.3 @@ -48,6 +48,7 @@ struct hw_interrupt_type;
     1.4   *
     1.5   *  Vectors 0xf0-0xf9 are free (reserved for future Linux use).
     1.6   */
     1.7 +#ifndef CONFIG_XEN
     1.8  #define SPURIOUS_APIC_VECTOR	0xff
     1.9  #define ERROR_APIC_VECTOR	0xfe
    1.10  #define INVALIDATE_TLB_VECTOR	0xfd
    1.11 @@ -57,7 +58,7 @@ struct hw_interrupt_type;
    1.12  #define KDB_VECTOR	0xf9
    1.13  
    1.14  #define THERMAL_APIC_VECTOR	0xf0
    1.15 -
    1.16 +#endif
    1.17  
    1.18  /*
    1.19   * Local APIC timer IRQ vector is on a different priority level,
     2.1 --- a/patches/linux-2.6.12/x86_64-linux.patch	Mon Aug 08 14:13:36 2005 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,68 +0,0 @@
     2.4 -diff -urN linux-2.6.10-orig/include/asm-x86_64/hw_irq.h linux-2.6.10/include/asm-x86_64/hw_irq.h
     2.5 ---- linux-2.6.10-orig/include/asm-x86_64/hw_irq.h	2005-01-06 00:34:38.000000000 -0500
     2.6 -+++ linux-2.6.10/include/asm-x86_64/hw_irq.h	2005-02-25 17:45:37.181518088 -0500
     2.7 -@@ -48,6 +48,7 @@
     2.8 -  *
     2.9 -  *  Vectors 0xf0-0xf9 are free (reserved for future Linux use).
    2.10 -  */
    2.11 -+#ifndef CONFIG_XEN
    2.12 - #define SPURIOUS_APIC_VECTOR	0xff
    2.13 - #define ERROR_APIC_VECTOR	0xfe
    2.14 - #define INVALIDATE_TLB_VECTOR	0xfd
    2.15 -@@ -57,7 +58,7 @@
    2.16 - #define KDB_VECTOR	0xf9
    2.17 - 
    2.18 - #define THERMAL_APIC_VECTOR	0xf0
    2.19 --
    2.20 -+#endif
    2.21 - 
    2.22 - /*
    2.23 -  * Local APIC timer IRQ vector is on a different priority level,
    2.24 -diff -urN linux-2.6.10-orig/include/asm-x86_64/irq.h linux-2.6.10/include/asm-x86_64/irq.h
    2.25 ---- linux-2.6.10-orig/include/asm-x86_64/irq.h	2005-01-06 00:34:38.000000000 -0500
    2.26 -+++ linux-2.6.10/include/asm-x86_64/irq.h	2005-02-25 17:45:37.181518088 -0500
    2.27 -@@ -10,6 +10,9 @@
    2.28 -  *	<tomsoft@informatik.tu-chemnitz.de>
    2.29 -  */
    2.30 - 
    2.31 -+#ifdef CONFIG_XEN
    2.32 -+#include "irq_vectors.h"
    2.33 -+#endif
    2.34 - #define TIMER_IRQ 0
    2.35 - 
    2.36 - /*
    2.37 -@@ -22,6 +25,7 @@
    2.38 -  * the usable vector space is 0x20-0xff (224 vectors)
    2.39 -  */
    2.40 - 
    2.41 -+#ifndef CONFIG_XEN
    2.42 - /*
    2.43 -  * The maximum number of vectors supported by x86_64 processors
    2.44 -  * is limited to 256. For processors other than x86_64, NR_VECTORS
    2.45 -@@ -38,6 +42,7 @@
    2.46 - #define NR_IRQS 224
    2.47 - #define NR_IRQ_VECTORS 1024
    2.48 - #endif
    2.49 -+#endif
    2.50 - 
    2.51 - static __inline__ int irq_canonicalize(int irq)
    2.52 - {
    2.53 -diff -urN linux-2.6.10-orig/include/asm-x86_64/posix_types.h linux-2.6.10/include/asm-x86_64/posix_types.h
    2.54 ---- linux-2.6.10-orig/include/asm-x86_64/posix_types.h	2004-10-18 17:55:29.000000000 -0400
    2.55 -+++ linux-2.6.10/include/asm-x86_64/posix_types.h	2005-02-25 17:45:37.183517784 -0500
    2.56 -@@ -6,7 +6,7 @@
    2.57 -  * be a little careful about namespace pollution etc.  Also, we cannot
    2.58 -  * assume GCC is being used.
    2.59 -  */
    2.60 --
    2.61 -+#ifndef __ASSEMBLY__
    2.62 - typedef unsigned long	__kernel_ino_t;
    2.63 - typedef unsigned int	__kernel_mode_t;
    2.64 - typedef unsigned long	__kernel_nlink_t;
    2.65 -@@ -115,5 +115,5 @@
    2.66 - }
    2.67 - 
    2.68 - #endif /* defined(__KERNEL__) */
    2.69 --
    2.70 -+#endif
    2.71 - #endif