diff options
| author | Andy Grover <agrover@groveronline.com> | 2002-03-14 23:28:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-03-14 23:28:59 -0800 |
| commit | b4f305ddf7e46a2ebb15f290a4563ccfb489cf2a (patch) | |
| tree | 2b70e9e427c526c73727838c6d72bf291a5a3f62 /include | |
| parent | f03ccc72886c199c4faf14887eec2ba5d878977c (diff) | |
[PATCH] ACPI patch 9/9
If you could only review one of the 9 patches, this would be the one.
- removes acpitable.c vestiges
- adds ACPI IRQ routing support to PCI (disableable via pci=noacpi option)
- adds code to get a <1MB page for sleep, and ACPI boot to setup.c
- allocates another page in the fixmap for ACPI
- changes driverfs a little to work better with ACPI.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/fixmap.h | 5 | ||||
| -rw-r--r-- | include/asm-i386/pci.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h index caac70ab1c9c..603caa2b42c6 100644 --- a/include/asm-i386/fixmap.h +++ b/include/asm-i386/fixmap.h @@ -15,6 +15,7 @@ #include <linux/config.h> #include <linux/kernel.h> +#include <asm/acpi.h> #include <asm/apicdef.h> #include <asm/page.h> #ifdef CONFIG_HIGHMEM @@ -68,6 +69,10 @@ enum fixed_addresses { FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, #endif +#ifdef CONFIG_ACPI_BOOT + FIX_ACPI_BEGIN, + FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, +#endif __end_of_permanent_fixed_addresses, /* temporary boot-time mappings, used before ioremap() is functional */ #define NR_FIX_BTMAPS 16 diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h index 10df65b20e4e..1d957c02e541 100644 --- a/include/asm-i386/pci.h +++ b/include/asm-i386/pci.h @@ -19,6 +19,11 @@ extern unsigned long pci_mem_start; #define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_MEM (pci_mem_start) +void pcibios_config_init(void); +struct pci_bus * pcibios_scan_root(int bus); +extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value); +extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value); + void pcibios_set_master(struct pci_dev *dev); void pcibios_penalize_isa_irq(int irq); struct irq_routing_table *pcibios_get_irq_routing_table(void); |