ia64/xen-unstable

view patches/linux-2.6.11/x86_64-linux.patch @ 5110:bb7d7790594e

bitkeeper revision 1.1522 (429270f7khx4oIwyDPU4ZpNIWXP8pA)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/xen-unstable.bk
author vh249@arcadians.cl.cam.ac.uk
date Tue May 24 00:10:31 2005 +0000 (2005-05-24)
parents 445b12a7221a 1e4b308becce
children 56a63f9f378f
line source
1 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 --- linux-2.6.10-orig/include/asm-x86_64/hw_irq.h 2005-01-06 00:34:38.000000000 -0500
3 +++ linux-2.6.10/include/asm-x86_64/hw_irq.h 2005-02-25 17:45:37.181518088 -0500
4 @@ -48,6 +48,7 @@
5 *
6 * Vectors 0xf0-0xf9 are free (reserved for future Linux use).
7 */
8 +#ifndef CONFIG_XEN
9 #define SPURIOUS_APIC_VECTOR 0xff
10 #define ERROR_APIC_VECTOR 0xfe
11 #define INVALIDATE_TLB_VECTOR 0xfd
12 @@ -57,7 +58,7 @@
13 #define KDB_VECTOR 0xf9
15 #define THERMAL_APIC_VECTOR 0xf0
16 -
17 +#endif
19 /*
20 * Local APIC timer IRQ vector is on a different priority level,
21 diff -urN linux-2.6.10-orig/include/asm-x86_64/irq.h linux-2.6.10/include/asm-x86_64/irq.h
22 --- linux-2.6.10-orig/include/asm-x86_64/irq.h 2005-01-06 00:34:38.000000000 -0500
23 +++ linux-2.6.10/include/asm-x86_64/irq.h 2005-02-25 17:45:37.181518088 -0500
24 @@ -10,6 +10,9 @@
25 * <tomsoft@informatik.tu-chemnitz.de>
26 */
28 +#ifdef CONFIG_XEN
29 +#include "irq_vectors.h"
30 +#endif
31 #define TIMER_IRQ 0
33 /*
34 @@ -22,6 +25,7 @@
35 * the usable vector space is 0x20-0xff (224 vectors)
36 */
38 +#ifndef CONFIG_XEN
39 /*
40 * The maximum number of vectors supported by x86_64 processors
41 * is limited to 256. For processors other than x86_64, NR_VECTORS
42 @@ -38,6 +42,7 @@
43 #define NR_IRQS 224
44 #define NR_IRQ_VECTORS 1024
45 #endif
46 +#endif
48 static __inline__ int irq_canonicalize(int irq)
49 {
50 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
51 --- linux-2.6.10-orig/include/asm-x86_64/posix_types.h 2004-10-18 17:55:29.000000000 -0400
52 +++ linux-2.6.10/include/asm-x86_64/posix_types.h 2005-02-25 17:45:37.183517784 -0500
53 @@ -6,7 +6,7 @@
54 * be a little careful about namespace pollution etc. Also, we cannot
55 * assume GCC is being used.
56 */
57 -
58 +#ifndef __ASSEMBLY__
59 typedef unsigned long __kernel_ino_t;
60 typedef unsigned int __kernel_mode_t;
61 typedef unsigned long __kernel_nlink_t;
62 @@ -115,5 +115,5 @@
63 }
65 #endif /* defined(__KERNEL__) */
66 -
67 +#endif
68 #endif