summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/actables.h
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-11-19 18:06:30 +0100
committerJ. Bruce Fields <bfields@redhat.com>2014-11-19 18:06:30 +0100
commit56429e9b3be567a173bd05f5594faf8522c34d3a (patch)
treed218d430ed992cdfa42da084bf36e5aa3c2ecb26 /drivers/acpi/acpica/actables.h
parentnfsd: convert nfs4_file searches to use RCU (diff)
parentSUNRPC: Fix locking around callback channel reply receive (diff)
downloadlinux-56429e9b3be567a173bd05f5594faf8522c34d3a.tar.xz
linux-56429e9b3be567a173bd05f5594faf8522c34d3a.zip
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client bugs that can interfere with my testing.
Diffstat (limited to 'drivers/acpi/acpica/actables.h')
-rw-r--r--drivers/acpi/acpica/actables.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index f14882788eee..1afe46e44dac 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -49,6 +49,8 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count);
/*
* tbxfroot - Root pointer utilities
*/
+u32 acpi_tb_get_rsdp_length(struct acpi_table_rsdp *rsdp);
+
acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);
u8 *acpi_tb_scan_memory_for_rsdp(u8 *start_address, u32 length);