diff options
| author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2007-02-02 19:48:19 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:14:22 -0500 |
| commit | ad71860a17ba33eb0e673e9e2cf5ba0d8e3e3fdd (patch) | |
| tree | 9f60547a2e8782c04d7cd1c41bc874047008458c /drivers/acpi/bus.c | |
| parent | a4bbb810dedaecf74d54b16b6dd3c33e95e1024c (diff) | |
| download | linux-3.10-ad71860a17ba33eb0e673e9e2cf5ba0d8e3e3fdd.tar.gz linux-3.10-ad71860a17ba33eb0e673e9e2cf5ba0d8e3e3fdd.tar.bz2 linux-3.10-ad71860a17ba33eb0e673e9e2cf5ba0d8e3e3fdd.zip | |
ACPICA: minimal patch to integrate new tables into Linux
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 766332e4559..cb807c43e59 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -44,9 +44,6 @@ ACPI_MODULE_NAME("acpi_bus") extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger); #endif -struct fadt_descriptor acpi_fadt; -EXPORT_SYMBOL(acpi_fadt); - struct acpi_device *acpi_root; struct proc_dir_entry *acpi_root_dir; EXPORT_SYMBOL(acpi_root_dir); @@ -582,11 +579,12 @@ static int __init acpi_bus_init_irq(void) return 0; } +acpi_native_uint acpi_gbl_permanent_mmap; + + void __init acpi_early_init(void) { acpi_status status = AE_OK; - struct acpi_buffer buffer = { sizeof(acpi_fadt), &acpi_fadt }; - if (acpi_disabled) return; @@ -597,6 +595,15 @@ void __init acpi_early_init(void) if (!acpi_strict) acpi_gbl_enable_interpreter_slack = TRUE; + acpi_gbl_permanent_mmap = 1; + + status = acpi_reallocate_root_table(); + if (ACPI_FAILURE(status)) { + printk(KERN_ERR PREFIX + "Unable to reallocate ACPI tables\n"); + goto error0; + } + status = acpi_initialize_subsystem(); if (ACPI_FAILURE(status)) { printk(KERN_ERR PREFIX @@ -611,14 +618,6 @@ void __init acpi_early_init(void) goto error0; } - /* - * Get a separate copy of the FADT for use by other drivers. - */ - status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &buffer); - if (ACPI_FAILURE(status)) { - printk(KERN_ERR PREFIX "Unable to get the FADT\n"); - goto error0; - } #ifdef CONFIG_X86 if (!acpi_ioapic) { extern acpi_interrupt_flags acpi_sci_flags; |