[ACPI] delete CONFIG_ACPI_PCI · tjh.dev/kernel@6153df7

-1

arch/i386/defconfig

··· 144 144 # CONFIG_ACPI_DEBUG is not set 145 145 CONFIG_ACPI_EC=y 146 146 CONFIG_ACPI_POWER=y 147 - CONFIG_ACPI_PCI=y 148 147 CONFIG_ACPI_SYSTEM=y 149 148 # CONFIG_X86_PM_TIMER is not set 150 149

-9

arch/i386/kernel/acpi/boot.c

··· 66 66 67 67 #define PREFIX "ACPI: " 68 68 69 - #ifdef CONFIG_ACPI_PCI 70 69 int acpi_noirq __initdata; /* skip ACPI IRQ initialization */ 71 70 int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */ 72 - #else 73 - int acpi_noirq __initdata = 1; 74 - int acpi_pci_disabled __initdata = 1; 75 - #endif 76 71 int acpi_ht __initdata = 1; /* enable HT */ 77 72 78 73 int acpi_lapic; ··· 844 849 845 850 #ifdef __i386__ 846 851 847 - #ifdef CONFIG_ACPI_PCI 848 852 static int __init disable_acpi_irq(struct dmi_system_id *d) 849 853 { 850 854 if (!acpi_force) { ··· 863 869 } 864 870 return 0; 865 871 } 866 - #endif 867 872 868 873 static int __init dmi_disable_acpi(struct dmi_system_id *d) 869 874 { ··· 1010 1017 }, 1011 1018 }, 1012 1019 1013 - #ifdef CONFIG_ACPI_PCI 1014 1020 /* 1015 1021 * Boxes that need ACPI PCI IRQ routing disabled 1016 1022 */ ··· 1047 1055 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), 1048 1056 }, 1049 1057 }, 1050 - #endif 1051 1058 {} 1052 1059 }; 1053 1060

+1 -1

arch/i386/pci/Makefile

··· 5 5 obj-$(CONFIG_PCI_DIRECT) += direct.o 6 6 7 7 pci-y := fixup.o 8 - pci-$(CONFIG_ACPI_PCI) += acpi.o 8 + pci-$(CONFIG_ACPI) += acpi.o 9 9 pci-y += legacy.o irq.o 10 10 11 11 pci-$(CONFIG_X86_VISWS) := visws.o fixup.o

+1 -1

arch/i386/pci/irq.c

··· 1075 1075 1076 1076 void pcibios_penalize_isa_irq(int irq, int active) 1077 1077 { 1078 - #ifdef CONFIG_ACPI_PCI 1078 + #ifdef CONFIG_ACPI 1079 1079 if (!acpi_noirq) 1080 1080 acpi_penalize_isa_irq(irq, active); 1081 1081 else

-1

arch/ia64/configs/bigsur_defconfig

··· 113 113 CONFIG_ACPI_THERMAL=m 114 114 # CONFIG_ACPI_DEBUG is not set 115 115 CONFIG_ACPI_POWER=y 116 - CONFIG_ACPI_PCI=y 117 116 CONFIG_ACPI_SYSTEM=y 118 117 119 118 #

-1

arch/ia64/configs/sn2_defconfig

··· 136 136 CONFIG_ACPI_NUMA=y 137 137 # CONFIG_ACPI_DEBUG is not set 138 138 CONFIG_ACPI_POWER=y 139 - CONFIG_ACPI_PCI=y 140 139 CONFIG_ACPI_SYSTEM=y 141 140 # CONFIG_ACPI_CONTAINER is not set 142 141

-1

arch/ia64/configs/tiger_defconfig

··· 135 135 CONFIG_ACPI_THERMAL=m 136 136 # CONFIG_ACPI_DEBUG is not set 137 137 CONFIG_ACPI_POWER=y 138 - CONFIG_ACPI_PCI=y 139 138 CONFIG_ACPI_SYSTEM=y 140 139 # CONFIG_ACPI_CONTAINER is not set 141 140

-1

arch/ia64/configs/zx1_defconfig

··· 134 134 CONFIG_ACPI_THERMAL=y 135 135 # CONFIG_ACPI_DEBUG is not set 136 136 CONFIG_ACPI_POWER=y 137 - CONFIG_ACPI_PCI=y 138 137 CONFIG_ACPI_SYSTEM=y 139 138 # CONFIG_ACPI_CONTAINER is not set 140 139

-1

arch/ia64/defconfig

··· 126 126 CONFIG_ACPI_NUMA=y 127 127 # CONFIG_ACPI_DEBUG is not set 128 128 CONFIG_ACPI_POWER=y 129 - CONFIG_ACPI_PCI=y 130 129 CONFIG_ACPI_SYSTEM=y 131 130 CONFIG_ACPI_CONTAINER=m 132 131

-1

arch/x86_64/defconfig

··· 151 151 # CONFIG_ACPI_DEBUG is not set 152 152 CONFIG_ACPI_EC=y 153 153 CONFIG_ACPI_POWER=y 154 - CONFIG_ACPI_PCI=y 155 154 CONFIG_ACPI_SYSTEM=y 156 155 # CONFIG_ACPI_CONTAINER is not set 157 156

+1 -1

arch/x86_64/pci/Makefile

··· 8 8 obj-y := i386.o 9 9 obj-$(CONFIG_PCI_DIRECT)+= direct.o 10 10 obj-y += fixup.o 11 - obj-$(CONFIG_ACPI_PCI) += acpi.o 11 + obj-$(CONFIG_ACPI) += acpi.o 12 12 obj-y += legacy.o irq.o common.o 13 13 # mmconfig has a 64bit special 14 14 obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o

+1 -1

arch/x86_64/pci/Makefile-BUS

··· 8 8 obj-y := i386.o 9 9 obj-$(CONFIG_PCI_DIRECT)+= direct.o 10 10 obj-y += fixup.o 11 - obj-$(CONFIG_ACPI_PCI) += acpi.o 11 + obj-$(CONFIG_ACPI) += acpi.o 12 12 obj-y += legacy.o irq.o common.o 13 13 # mmconfig has a 64bit special 14 14 obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o

+2 -5

drivers/acpi/Kconfig

··· 3 3 # 4 4 5 5 menu "ACPI (Advanced Configuration and Power Interface) Support" 6 - depends on PM 7 6 depends on !X86_VISWS 8 7 depends on !IA64_HP_SIM 9 8 depends on IA64 || X86 ··· 10 11 config ACPI 11 12 bool "ACPI Support" 12 13 depends on IA64 || X86 14 + select PM 15 + select PCI 13 16 14 17 default y 15 18 ---help--- ··· 281 280 config ACPI_POWER 282 281 bool 283 282 default y 284 - 285 - config ACPI_PCI 286 - bool 287 - default PCI 288 283 289 284 config ACPI_SYSTEM 290 285 bool

+1 -1

drivers/acpi/Makefile

··· 44 44 obj-$(CONFIG_ACPI_FAN) += fan.o 45 45 obj-$(CONFIG_ACPI_VIDEO) += video.o 46 46 obj-$(CONFIG_ACPI_HOTKEY) += hotkey.o 47 - obj-$(CONFIG_ACPI_PCI) += pci_root.o pci_link.o pci_irq.o pci_bind.o 47 + obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o 48 48 obj-$(CONFIG_ACPI_POWER) += power.o 49 49 obj-$(CONFIG_ACPI_PROCESSOR) += processor.o 50 50 obj-$(CONFIG_ACPI_CONTAINER) += container.o

-28

drivers/acpi/osl.c

··· 86 86 * Initialize PCI configuration space access, as we'll need to access 87 87 * it while walking the namespace (bus 0 and root bridges w/ _BBNs). 88 88 */ 89 - #ifdef CONFIG_ACPI_PCI 90 89 if (!raw_pci_ops) { 91 90 printk(KERN_ERR PREFIX 92 91 "Access to PCI configuration space unavailable\n"); 93 92 return AE_NULL_ENTRY; 94 93 } 95 - #endif 96 94 kacpid_wq = create_singlethread_workqueue("kacpid"); 97 95 BUG_ON(!kacpid_wq); 98 96 ··· 482 484 return AE_OK; 483 485 } 484 486 485 - #ifdef CONFIG_ACPI_PCI 486 - 487 487 acpi_status 488 488 acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, 489 489 void *value, u32 width) ··· 613 617 614 618 acpi_os_derive_pci_id_2(rhandle, chandle, id, &is_bridge, &bus_number); 615 619 } 616 - 617 - #else /*!CONFIG_ACPI_PCI */ 618 - 619 - acpi_status 620 - acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, 621 - u32 reg, acpi_integer value, u32 width) 622 - { 623 - return AE_SUPPORT; 624 - } 625 - 626 - acpi_status 627 - acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, 628 - u32 reg, void *value, u32 width) 629 - { 630 - return AE_SUPPORT; 631 - } 632 - 633 - void acpi_os_derive_pci_id(acpi_handle rhandle, /* upper bound */ 634 - acpi_handle chandle, /* current node */ 635 - struct acpi_pci_id **id) 636 - { 637 - } 638 - 639 - #endif /*CONFIG_ACPI_PCI */ 640 620 641 621 static void acpi_os_execute_deferred(void *context) 642 622 {

-4

include/acpi/acpi_drivers.h

··· 47 47 PCI 48 48 -------------------------------------------------------------------------- */ 49 49 50 - #ifdef CONFIG_ACPI_PCI 51 - 52 50 #define ACPI_PCI_COMPONENT 0x00400000 53 51 54 52 /* ACPI PCI Interrupt Link (pci_link.c) */ ··· 75 77 76 78 struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, 77 79 int bus); 78 - 79 - #endif /*CONFIG_ACPI_PCI */ 80 80 81 81 /* -------------------------------------------------------------------------- 82 82 Power Resource

+8 -10

include/asm-i386/acpi.h

··· 146 146 147 147 #endif 148 148 149 - #else /* !CONFIG_ACPI */ 150 - # define acpi_lapic 0 151 - # define acpi_ioapic 0 152 - 153 - #endif 154 - 155 - #ifdef CONFIG_ACPI_PCI 156 149 static inline void acpi_noirq_set(void) { acpi_noirq = 1; } 157 150 static inline void acpi_disable_pci(void) 158 151 { ··· 153 160 acpi_noirq_set(); 154 161 } 155 162 extern int acpi_irq_balance_set(char *str); 156 - #else 163 + 164 + #else /* !CONFIG_ACPI */ 165 + 166 + #define acpi_lapic 0 167 + #define acpi_ioapic 0 157 168 static inline void acpi_noirq_set(void) { } 158 169 static inline void acpi_disable_pci(void) { } 159 - static inline int acpi_irq_balance_set(char *str) { return 0; } 160 - #endif 170 + 171 + #endif /* !CONFIG_ACPI */ 172 + 161 173 162 174 #ifdef CONFIG_ACPI_SLEEP 163 175

+11 -14

include/asm-x86_64/acpi.h

··· 121 121 #define FIX_ACPI_PAGES 4 122 122 123 123 extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); 124 - 125 - #else /* !CONFIG_ACPI */ 126 - #define acpi_lapic 0 127 - #define acpi_ioapic 0 128 - #endif /* !CONFIG_ACPI */ 129 - 130 - extern int acpi_numa; 131 - extern int acpi_scan_nodes(unsigned long start, unsigned long end); 132 - #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) 133 - 134 - #ifdef CONFIG_ACPI_PCI 135 124 static inline void acpi_noirq_set(void) { acpi_noirq = 1; } 136 125 static inline void acpi_disable_pci(void) 137 126 { ··· 128 139 acpi_noirq_set(); 129 140 } 130 141 extern int acpi_irq_balance_set(char *str); 131 - #else 142 + 143 + #else /* !CONFIG_ACPI */ 144 + 145 + #define acpi_lapic 0 146 + #define acpi_ioapic 0 132 147 static inline void acpi_noirq_set(void) { } 133 148 static inline void acpi_disable_pci(void) { } 134 - static inline int acpi_irq_balance_set(char *str) { return 0; } 135 - #endif 149 + 150 + #endif /* !CONFIG_ACPI */ 151 + 152 + extern int acpi_numa; 153 + extern int acpi_scan_nodes(unsigned long start, unsigned long end); 154 + #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) 136 155 137 156 #ifdef CONFIG_ACPI_SLEEP 138 157

+2 -2

include/linux/acpi.h

··· 445 445 */ 446 446 void acpi_unregister_gsi (u32 gsi); 447 447 448 - #ifdef CONFIG_ACPI_PCI 448 + #ifdef CONFIG_ACPI 449 449 450 450 struct acpi_prt_entry { 451 451 struct list_head node; ··· 479 479 int acpi_pci_register_driver(struct acpi_pci_driver *driver); 480 480 void acpi_pci_unregister_driver(struct acpi_pci_driver *driver); 481 481 482 - #endif /*CONFIG_ACPI_PCI*/ 482 + #endif /* CONFIG_ACPI */ 483 483 484 484 #ifdef CONFIG_ACPI_EC 485 485