diff options
-rw-r--r-- | arch/ia64/Kconfig | 11 | ||||
-rw-r--r-- | arch/ia64/kernel/perfmon.c | 1 | ||||
-rw-r--r-- | include/asm-ia64/iosapic.h | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index cbb3e0cef93a..80988136f26d 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -392,15 +392,8 @@ menu "Bus options (PCI, PCMCIA)" | |||
392 | config PCI | 392 | config PCI |
393 | bool "PCI support" | 393 | bool "PCI support" |
394 | help | 394 | help |
395 | Find out whether you have a PCI motherboard. PCI is the name of a | 395 | Real IA-64 machines all have PCI/PCI-X/PCI Express busses. Say Y |
396 | bus system, i.e. the way the CPU talks to the other stuff inside | 396 | here unless you are using a simulator without PCI support. |
397 | your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or | ||
398 | VESA. If you have PCI, say Y, otherwise N. | ||
399 | |||
400 | The PCI-HOWTO, available from | ||
401 | <http://www.tldp.org/docs.html#howto>, contains valuable | ||
402 | information about which PCI hardware does work under Linux and which | ||
403 | doesn't. | ||
404 | 397 | ||
405 | config PCI_DOMAINS | 398 | config PCI_DOMAINS |
406 | bool | 399 | bool |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index b8ebb8e427ef..f1201ac8a116 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -4312,6 +4312,7 @@ pfm_context_load(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs) | |||
4312 | DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n", | 4312 | DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n", |
4313 | thread->pfm_context, ctx)); | 4313 | thread->pfm_context, ctx)); |
4314 | 4314 | ||
4315 | ret = -EBUSY; | ||
4315 | old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *)); | 4316 | old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *)); |
4316 | if (old != NULL) { | 4317 | if (old != NULL) { |
4317 | DPRINT(("load_pid [%d] already has a context\n", req->load_pid)); | 4318 | DPRINT(("load_pid [%d] already has a context\n", req->load_pid)); |
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h index 1093f35b3b90..a429fe225b07 100644 --- a/include/asm-ia64/iosapic.h +++ b/include/asm-ia64/iosapic.h | |||
@@ -75,6 +75,8 @@ extern int __devinit iosapic_init (unsigned long address, | |||
75 | unsigned int gsi_base); | 75 | unsigned int gsi_base); |
76 | #ifdef CONFIG_HOTPLUG | 76 | #ifdef CONFIG_HOTPLUG |
77 | extern int iosapic_remove (unsigned int gsi_base); | 77 | extern int iosapic_remove (unsigned int gsi_base); |
78 | #else | ||
79 | #define iosapic_remove(gsi_base) (-EINVAL) | ||
78 | #endif /* CONFIG_HOTPLUG */ | 80 | #endif /* CONFIG_HOTPLUG */ |
79 | extern int gsi_to_vector (unsigned int gsi); | 81 | extern int gsi_to_vector (unsigned int gsi); |
80 | extern int gsi_to_irq (unsigned int gsi); | 82 | extern int gsi_to_irq (unsigned int gsi); |
@@ -102,9 +104,7 @@ extern void __devinit map_iosapic_to_node (unsigned int, int); | |||
102 | #else | 104 | #else |
103 | #define iosapic_system_init(pcat_compat) do { } while (0) | 105 | #define iosapic_system_init(pcat_compat) do { } while (0) |
104 | #define iosapic_init(address,gsi_base) (-EINVAL) | 106 | #define iosapic_init(address,gsi_base) (-EINVAL) |
105 | #ifdef CONFIG_HOTPLUG | ||
106 | #define iosapic_remove(gsi_base) (-ENODEV) | 107 | #define iosapic_remove(gsi_base) (-ENODEV) |
107 | #endif /* CONFIG_HOTPLUG */ | ||
108 | #define iosapic_register_intr(gsi,polarity,trigger) (gsi) | 108 | #define iosapic_register_intr(gsi,polarity,trigger) (gsi) |
109 | #define iosapic_unregister_intr(irq) do { } while (0) | 109 | #define iosapic_unregister_intr(irq) do { } while (0) |
110 | #define iosapic_override_isa_irq(isa_irq,gsi,polarity,trigger) do { } while (0) | 110 | #define iosapic_override_isa_irq(isa_irq,gsi,polarity,trigger) do { } while (0) |