openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[IA64] Minor cleanups - remove CONFIG_ACPI_DEALLOCATE_IRQ 

The config option 'CONFIG_ACPI_DEALLOCATE_IRQ' is no longer
needed. This patch removes it.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Kenji Kaneshige 2005-09-07 14:06:25 +09:00 committed by Tony Luck
parent a52ac87eb2
commit 697eaad417
9 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/ia64/Kconfig
View File

@ -338,11 +338,6 @@ config IA64_PALINFO
To use this option, you have to ensure that the "/proc file system To use this option, you have to ensure that the "/proc file system
support" (CONFIG_PROC_FS) is enabled, too. support" (CONFIG_PROC_FS) is enabled, too.
config ACPI_DEALLOCATE_IRQ
bool
depends on IOSAPIC && EXPERIMENTAL
default y
source "drivers/firmware/Kconfig" source "drivers/firmware/Kconfig"
source "fs/Kconfig.binfmt" source "fs/Kconfig.binfmt"

1
arch/ia64/configs/sn2_defconfig
View File

@ -111,7 +111,6 @@ CONFIG_COMPAT=y
CONFIG_IA64_MCA_RECOVERY=y CONFIG_IA64_MCA_RECOVERY=y
CONFIG_PERFMON=y CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y CONFIG_IA64_PALINFO=y
CONFIG_ACPI_DEALLOCATE_IRQ=y
# #
# Firmware Drivers # Firmware Drivers

1
arch/ia64/configs/tiger_defconfig
View File

@ -109,7 +109,6 @@ CONFIG_COMPAT=y
CONFIG_IA64_MCA_RECOVERY=y CONFIG_IA64_MCA_RECOVERY=y
CONFIG_PERFMON=y CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y CONFIG_IA64_PALINFO=y
CONFIG_ACPI_DEALLOCATE_IRQ=y
# #
# Firmware Drivers # Firmware Drivers

1
arch/ia64/configs/zx1_defconfig
View File

@ -109,7 +109,6 @@ CONFIG_COMPAT=y
CONFIG_IA64_MCA_RECOVERY=y CONFIG_IA64_MCA_RECOVERY=y
CONFIG_PERFMON=y CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y CONFIG_IA64_PALINFO=y
CONFIG_ACPI_DEALLOCATE_IRQ=y
# #
# Firmware Drivers # Firmware Drivers

1
arch/ia64/defconfig
View File

@ -99,7 +99,6 @@ CONFIG_COMPAT=y
CONFIG_IA64_MCA_RECOVERY=y CONFIG_IA64_MCA_RECOVERY=y
CONFIG_PERFMON=y CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y CONFIG_IA64_PALINFO=y
CONFIG_ACPI_DEALLOCATE_IRQ=y
# #
# Firmware Drivers # Firmware Drivers

2
arch/ia64/kernel/acpi.c
View File

@ -575,14 +575,12 @@ acpi_register_gsi (u32 gsi, int edge_level, int active_high_low)
} }
EXPORT_SYMBOL(acpi_register_gsi); EXPORT_SYMBOL(acpi_register_gsi);
#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
void void
acpi_unregister_gsi (u32 gsi) acpi_unregister_gsi (u32 gsi)
{ {
iosapic_unregister_intr(gsi); iosapic_unregister_intr(gsi);
} }
EXPORT_SYMBOL(acpi_unregister_gsi); EXPORT_SYMBOL(acpi_unregister_gsi);
#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */
static int __init static int __init
acpi_parse_fadt (unsigned long phys_addr, unsigned long size) acpi_parse_fadt (unsigned long phys_addr, unsigned long size)

2
arch/ia64/kernel/iosapic.c
View File

@ -776,7 +776,6 @@ iosapic_register_intr (unsigned int gsi,
return vector; return vector;
} }
#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
void void
iosapic_unregister_intr (unsigned int gsi) iosapic_unregister_intr (unsigned int gsi)
{ {
@ -859,7 +858,6 @@ iosapic_unregister_intr (unsigned int gsi)
spin_unlock(&iosapic_lock); spin_unlock(&iosapic_lock);
spin_unlock_irqrestore(&idesc->lock, flags); spin_unlock_irqrestore(&idesc->lock, flags);
} }
#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */
/* /*
* ACPI calls this when it finds an entry for a platform interrupt. * ACPI calls this when it finds an entry for a platform interrupt.

2
arch/ia64/pci/pci.c
View File

@ -498,13 +498,11 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
return acpi_pci_irq_enable(dev); return acpi_pci_irq_enable(dev);
} }
#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
void void
pcibios_disable_device (struct pci_dev *dev) pcibios_disable_device (struct pci_dev *dev)
{ {
acpi_pci_irq_disable(dev); acpi_pci_irq_disable(dev);
} }
#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */
void void
pcibios_align_resource (void *data, struct resource *res, pcibios_align_resource (void *data, struct resource *res,

2
include/asm-ia64/iosapic.h
View File

@ -83,9 +83,7 @@ extern int gsi_to_irq (unsigned int gsi);
extern void iosapic_enable_intr (unsigned int vector); extern void iosapic_enable_intr (unsigned int vector);
extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity, extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity,
unsigned long trigger); unsigned long trigger);
#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
extern void iosapic_unregister_intr (unsigned int irq); extern void iosapic_unregister_intr (unsigned int irq);
#endif
extern void __init iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, extern void __init iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,
unsigned long polarity, unsigned long polarity,
unsigned long trigger); unsigned long trigger);