* [PATCH 05/10] xen/acpi: Move acpi_memory_info definition to public
@ 2011-12-23 10:27 Liu, Jinsong
2011-12-23 13:17 ` [Xen-devel] " Konrad Rzeszutek Wilk
0 siblings, 1 reply; 2+ messages in thread
From: Liu, Jinsong @ 2011-12-23 10:27 UTC (permalink / raw)
To: konrad.wilk@oracle.com
Cc: Jiang, Yunhong, jeremy.fitzhardinge@citrix.com, Shan, Haitao,
Zhao, Yakui, Brown, Len, Luck, Tony, Kleen, Andi,
xen-devel@lists.xensource.com, Kernel development list
[-- Attachment #1: Type: text/plain, Size: 2779 bytes --]
>From 0172b1ce6a2ba70e739f968622d78ac1796813f9 Mon Sep 17 00:00:00 2001
From: Liu Jinsong <jinsong.liu@intel.com>
Date: Sun, 11 Dec 2011 17:25:35 +0800
Subject: [PATCH 05/10] xen/acpi: Move acpi_memory_info definition to public
This patch rebased from Jeremy's pvops commit
359e747e6260f105f750657917e1dc75f6427602
Move this definition to header file so that it can be used by dom0
memory hotadd logic also.
Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
drivers/acpi/acpi_memhotplug.c | 15 ---------------
include/acpi/acpi_drivers.h | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index d985713..e28e64d 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -71,21 +71,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_drivers.h b/include/acpi/acpi_drivers.h
index e49c36d..833de75 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -154,4 +154,25 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
}
#endif
+/*--------------------------------------------------------------------------
+ Memory
+ -------------------------------------------------------------------------- */
+#if defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
+ defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+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
+
#endif /*__ACPI_DRIVERS_H__*/
--
1.6.5.6
[-- Attachment #2: 0005-xen-acpi-Move-acpi_memory_info-definition-to-public.patch --]
[-- Type: application/octet-stream, Size: 2702 bytes --]
From 0172b1ce6a2ba70e739f968622d78ac1796813f9 Mon Sep 17 00:00:00 2001
From: Liu Jinsong <jinsong.liu@intel.com>
Date: Sun, 11 Dec 2011 17:25:35 +0800
Subject: [PATCH 05/10] xen/acpi: Move acpi_memory_info definition to public
This patch rebased from Jeremy's pvops commit
359e747e6260f105f750657917e1dc75f6427602
Move this definition to header file so that it can be used by dom0
memory hotadd logic also.
Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
drivers/acpi/acpi_memhotplug.c | 15 ---------------
include/acpi/acpi_drivers.h | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index d985713..e28e64d 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -71,21 +71,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_drivers.h b/include/acpi/acpi_drivers.h
index e49c36d..833de75 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -154,4 +154,25 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
}
#endif
+/*--------------------------------------------------------------------------
+ Memory
+ -------------------------------------------------------------------------- */
+#if defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
+ defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+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
+
#endif /*__ACPI_DRIVERS_H__*/
--
1.6.5.6
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Xen-devel] [PATCH 05/10] xen/acpi: Move acpi_memory_info definition to public
2011-12-23 10:27 [PATCH 05/10] xen/acpi: Move acpi_memory_info definition to public Liu, Jinsong
@ 2011-12-23 13:17 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 2+ messages in thread
From: Konrad Rzeszutek Wilk @ 2011-12-23 13:17 UTC (permalink / raw)
To: Liu, Jinsong
Cc: konrad.wilk@oracle.com, Brown, Len,
jeremy.fitzhardinge@citrix.com, Jiang, Yunhong, Shan, Haitao,
Kernel development list, Zhao, Yakui, Luck, Tony, Kleen, Andi,
xen-devel@lists.xensource.com
On Fri, Dec 23, 2011 at 10:27:19AM +0000, Liu, Jinsong wrote:
> >From 0172b1ce6a2ba70e739f968622d78ac1796813f9 Mon Sep 17 00:00:00 2001
> From: Liu Jinsong <jinsong.liu@intel.com>
> Date: Sun, 11 Dec 2011 17:25:35 +0800
> Subject: [PATCH 05/10] xen/acpi: Move acpi_memory_info definition to public
Take out the 'xen'. this patch touches the generic code, not the Xen
code.
>
> This patch rebased from Jeremy's pvops commit
> 359e747e6260f105f750657917e1dc75f6427602
Not sure what relevance that has actually..
>
> Move this definition to header file so that it can be used by dom0
> memory hotadd logic also.
And include the name of the patch that uses this so when somebody is
using 'gitk' or 'git gui blame' they can at least search for the patch
that leverages this.
>
> Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
> Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
> ---
> drivers/acpi/acpi_memhotplug.c | 15 ---------------
> include/acpi/acpi_drivers.h | 21 +++++++++++++++++++++
> 2 files changed, 21 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
> index d985713..e28e64d 100644
> --- a/drivers/acpi/acpi_memhotplug.c
> +++ b/drivers/acpi/acpi_memhotplug.c
> @@ -71,21 +71,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_drivers.h b/include/acpi/acpi_drivers.h
> index e49c36d..833de75 100644
> --- a/include/acpi/acpi_drivers.h
> +++ b/include/acpi/acpi_drivers.h
> @@ -154,4 +154,25 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
> }
> #endif
>
> +/*--------------------------------------------------------------------------
> + Memory
> + -------------------------------------------------------------------------- */
> +#if defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
> + defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
> +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
> +
> #endif /*__ACPI_DRIVERS_H__*/
> --
> 1.6.5.6
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-23 13:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-23 10:27 [PATCH 05/10] xen/acpi: Move acpi_memory_info definition to public Liu, Jinsong
2011-12-23 13:17 ` [Xen-devel] " Konrad Rzeszutek Wilk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).