summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-06-02 00:48:48 -0400
committerLen Brown <len.brown@intel.com>2007-06-02 00:48:48 -0400
commitfcf75356e9cf0460ef47a5b756bc3b0951ecab59 (patch)
tree5d5cb365b3e17a452c23a50eb9903a90578a146a /include/acpi
parentf285e3d329ce68cc355fadf4ab2c8f34d7f264cb (diff)
parent6287ee32952b502c23d54f12895c3895ddbe5013 (diff)
Pull now into release branch
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_numa.h2
-rw-r--r--include/acpi/acutils.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
index b62cd36ff32..e2fcee2b340 100644
--- a/include/acpi/acpi_numa.h
+++ b/include/acpi/acpi_numa.h
@@ -13,7 +13,7 @@
extern int pxm_to_node(int);
extern int node_to_pxm(int);
-extern int __cpuinit acpi_map_pxm_to_node(int);
+extern int acpi_map_pxm_to_node(int);
extern void __cpuinit acpi_unmap_pxm_to_node(int);
#endif /* CONFIG_ACPI_NUMA */
diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h
index 15a838862cd..a87ef1c8d46 100644
--- a/include/acpi/acutils.h
+++ b/include/acpi/acutils.h
@@ -390,6 +390,8 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object);
u8 acpi_ut_valid_internal_object(void *object);
+union acpi_operand_object *acpi_ut_create_package_object(u32 count);
+
union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size);
union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size);