ia64/xen-unstable

view patches/linux-2.6.11/x86_64-linux.patch @ 4547:73ef7f1fc714

bitkeeper revision 1.1307 (42604f23zhUwzxPQ-mNyzol0cpHWlg)

[PATCH] Eliminate kernel version checks from

Eliminate kernel version checks from x86_64/kernel/pci-dma.c as a trivial
first pass cleanup towards merging.

Signed-off-by: Chris Wright <chrisw@osdl.org>
author chrisw@osdl.org[iap10]
date Fri Apr 15 23:32:51 2005 +0000 (2005-04-15)
parents 445b12a7221a
children 1e4b308becce bb7d7790594e
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 +#if 0
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,7 @@
25 * <tomsoft@informatik.tu-chemnitz.de>
26 */
28 +#include "irq_vectors.h"
29 #define TIMER_IRQ 0
31 /*
32 @@ -22,6 +23,7 @@
33 * the usable vector space is 0x20-0xff (224 vectors)
34 */
36 +#if 0
37 /*
38 * The maximum number of vectors supported by x86_64 processors
39 * is limited to 256. For processors other than x86_64, NR_VECTORS
40 @@ -38,6 +40,7 @@
41 #define NR_IRQS 224
42 #define NR_IRQ_VECTORS 1024
43 #endif
44 +#endif
46 static __inline__ int irq_canonicalize(int irq)
47 {
48 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
49 --- linux-2.6.10-orig/include/asm-x86_64/posix_types.h 2004-10-18 17:55:29.000000000 -0400
50 +++ linux-2.6.10/include/asm-x86_64/posix_types.h 2005-02-25 17:45:37.183517784 -0500
51 @@ -6,7 +6,7 @@
52 * be a little careful about namespace pollution etc. Also, we cannot
53 * assume GCC is being used.
54 */
55 -
56 +#ifndef __ASSEMBLY__
57 typedef unsigned long __kernel_ino_t;
58 typedef unsigned int __kernel_mode_t;
59 typedef unsigned long __kernel_nlink_t;
60 @@ -115,5 +115,5 @@
61 }
63 #endif /* defined(__KERNEL__) */
64 -
65 +#endif
66 #endif