summaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-generic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 04:09:58 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-28 23:20:13 +0100
commit9b5bc8dc12421a4b17047061f473d85c1797d543 (patch)
tree69799378fb9e55dd8c23ceb39c646d7bf47523f8 /arch/x86/mach-generic
parentf8987a1093cc7a896137e264c24e04d4048e9f95 (diff)
downloadop-kernel-dev-9b5bc8dc12421a4b17047061f473d85c1797d543.zip
op-kernel-dev-9b5bc8dc12421a4b17047061f473d85c1797d543.tar.gz
x86, apic: remove IRQ_DEST_MODE / IRQ_DELIVERY_MODE
Remove the wrapper macros IRQ_DEST_MODE and IRQ_DELIVERY_MODE. The typical 32-bit and the 64-bit build all dereference via the genapic, so it's pointless to hide that indirection via these ugly macros. Furthermore, it also obscures subarchitecture details. So replace it with apic->irq_dest_mode / etc. accesses. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-generic')
-rw-r--r--arch/x86/mach-generic/bigsmp.c4
-rw-r--r--arch/x86/mach-generic/default.c4
-rw-r--r--arch/x86/mach-generic/es7000.c4
-rw-r--r--arch/x86/mach-generic/numaq.c4
-rw-r--r--arch/x86/mach-generic/summit.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index c15c1aa..e8c1cec 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -64,8 +64,8 @@ struct genapic apic_bigsmp = {
.acpi_madt_oem_check = NULL,
.apic_id_registered = bigsmp_apic_id_registered,
- .irq_delivery_mode = IRQ_DELIVERY_MODE,
- .irq_dest_mode = IRQ_DEST_MODE,
+ .irq_delivery_mode = BIGSMP_IRQ_DELIVERY_MODE,
+ .irq_dest_mode = BIGSMP_IRQ_DEST_MODE,
.target_cpus = target_cpus,
.ESR_DISABLE = esr_disable,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index d32b175..0482106 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -31,8 +31,8 @@ struct genapic apic_default = {
.acpi_madt_oem_check = NULL,
.apic_id_registered = default_apic_id_registered,
- .irq_delivery_mode = IRQ_DELIVERY_MODE,
- .irq_dest_mode = IRQ_DEST_MODE,
+ .irq_delivery_mode = DEFAULT_IRQ_DELIVERY_MODE,
+ .irq_dest_mode = DEFAULT_IRQ_DEST_MODE,
.target_cpus = target_cpus,
.ESR_DISABLE = esr_disable,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 0665389..5d97408 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -107,8 +107,8 @@ struct genapic apic_es7000 = {
.acpi_madt_oem_check = es7000_acpi_madt_oem_check,
.apic_id_registered = es7000_apic_id_registered,
- .irq_delivery_mode = IRQ_DELIVERY_MODE,
- .irq_dest_mode = IRQ_DEST_MODE,
+ .irq_delivery_mode = ES7000_IRQ_DELIVERY_MODE,
+ .irq_dest_mode = ES7000_IRQ_DEST_MODE,
.target_cpus = target_cpus,
.ESR_DISABLE = esr_disable,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 4019571..77ac669 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -51,8 +51,8 @@ struct genapic apic_numaq = {
.acpi_madt_oem_check = NULL,
.apic_id_registered = numaq_apic_id_registered,
- .irq_delivery_mode = IRQ_DELIVERY_MODE,
- .irq_dest_mode = IRQ_DEST_MODE,
+ .irq_delivery_mode = NUMAQ_IRQ_DELIVERY_MODE,
+ .irq_dest_mode = NUMAQ_IRQ_DEST_MODE,
.target_cpus = target_cpus,
.ESR_DISABLE = esr_disable,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 946da7a..7b3f43c 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -44,8 +44,8 @@ struct genapic apic_summit = {
.acpi_madt_oem_check = summit_acpi_madt_oem_check,
.apic_id_registered = summit_apic_id_registered,
- .irq_delivery_mode = IRQ_DELIVERY_MODE,
- .irq_dest_mode = IRQ_DEST_MODE,
+ .irq_delivery_mode = SUMMIT_IRQ_DELIVERY_MODE,
+ .irq_dest_mode = SUMMIT_IRQ_DEST_MODE,
.target_cpus = target_cpus,
.ESR_DISABLE = esr_disable,
OpenPOWER on IntegriCloud