Jiang, Yunhong
2009-Dec-18 10:27 UTC
[Xen-devel] [PATCH] Move acpi_memory_info definition to public
Please be notice that there will be a checkpatch warning, but that is caused by
original code, so I didn''t change it.
Move this definition to header file so that it can be used by dom0 memory hotadd
logic also.
Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
---
drivers/acpi/acpi_memhotplug.c | 15 ---------------
include/acpi/acpi_numa.h | 14 ++++++++++++++
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 9a62224..50e17c7 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -72,21 +72,6 @@ static struct acpi_driver acpi_memory_device_driver = {
},
};
-struct acpi_memory_info {
- struct list_head list;
- u64 start_addr; /* Memory Range start physical addr */
- u64 length; /* Memory Range length */
- unsigned short caching; /* memory cache attribute */
- unsigned short write_protect; /* memory read/write attribute */
- unsigned int enabled:1;
-};
-
-struct acpi_memory_device {
- struct acpi_device * device;
- unsigned int state; /* State of the memory device */
- struct list_head res_list;
-};
-
static int acpi_hotmem_initialized;
static acpi_status
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
index 1739726..a271d37 100644
--- a/include/acpi/acpi_numa.h
+++ b/include/acpi/acpi_numa.h
@@ -16,5 +16,19 @@ extern int node_to_pxm(int);
extern void __acpi_map_pxm_to_node(int, int);
extern int acpi_map_pxm_to_node(int);
+struct acpi_memory_info {
+ struct list_head list;
+ u64 start_addr; /* Memory Range start physical addr */
+ u64 length; /* Memory Range length */
+ unsigned short caching; /* memory cache attribute */
+ unsigned short write_protect; /* memory read/write attribute */
+ unsigned int enabled:1;
+};
+
+struct acpi_memory_device {
+ struct acpi_device * device;
+ unsigned int state; /* State of the memory device */
+ struct list_head res_list;
+};
#endif /* CONFIG_ACPI_NUMA */
#endif /* __ACP_NUMA_H */
--
1.5.4.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel