diff options
| author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2007-02-02 16:48:19 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 02:14:22 (GMT) |
| commit | ad71860a17ba33eb0e673e9e2cf5ba0d8e3e3fdd (patch) | |
| tree | 9f60547a2e8782c04d7cd1c41bc874047008458c /drivers/acpi/tables | |
| parent | a4bbb810dedaecf74d54b16b6dd3c33e95e1024c (diff) | |
| download | linux-ad71860a17ba33eb0e673e9e2cf5ba0d8e3e3fdd.tar.xz | |
ACPICA: minimal patch to integrate new tables into Linux
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/tables')
| -rw-r--r-- | drivers/acpi/tables/Makefile | 3 | ||||
| -rw-r--r-- | drivers/acpi/tables/tbutils.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/tables/tbxface.c | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/acpi/tables/Makefile b/drivers/acpi/tables/Makefile index aa4c695..f08f1f3 100644 --- a/drivers/acpi/tables/Makefile +++ b/drivers/acpi/tables/Makefile @@ -2,7 +2,6 @@ # Makefile for all Linux ACPI interpreter subdirectories # -obj-y := tbconvrt.o tbget.o tbrsdt.o tbxface.o \ - tbgetall.o tbinstal.o tbutils.o tbxfroot.o +obj-y := tbxface.o tbinstal.o tbutils.o tbfind.o EXTRA_CFLAGS += $(ACPI_CFLAGS) diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c index 8e44f83..6d13737 100644 --- a/drivers/acpi/tables/tbutils.c +++ b/drivers/acpi/tables/tbutils.c @@ -545,7 +545,7 @@ acpi_tb_get_root_table_entry(u8 * table_entry, * ******************************************************************************/ -acpi_status +acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags) { struct acpi_table_rsdp *rsdp; diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c index 13e8d66..94544a6 100644 --- a/drivers/acpi/tables/tbxface.c +++ b/drivers/acpi/tables/tbxface.c @@ -78,7 +78,7 @@ static acpi_status acpi_tb_load_namespace(void); * ******************************************************************************/ -acpi_status +acpi_status __init acpi_initialize_tables(struct acpi_table_desc *initial_table_array, u32 initial_table_count, u8 allow_resize) { @@ -132,8 +132,6 @@ acpi_initialize_tables(struct acpi_table_desc *initial_table_array, return_ACPI_STATUS(status); } -ACPI_EXPORT_SYMBOL(acpi_initialize_tables) - /******************************************************************************* * * FUNCTION: acpi_reallocate_root_table @@ -365,6 +363,10 @@ acpi_get_table(char *signature, *out_table = acpi_gbl_root_table_list.tables[i].pointer; } + if (!acpi_gbl_permanent_mmap) { + acpi_gbl_root_table_list.tables[i].pointer = 0; + } + return (status); } |