diff --git a/[refs] b/[refs]
index 2fbf036f4892..54c68efb090b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b22ff77b82598ff131d215627533e09e4a472220
+refs/heads/master: 40a58637a4fa10a2faea71f0f30ff0b3d74c6e00
diff --git a/trunk/drivers/xen/xen-acpi-memhotplug.c b/trunk/drivers/xen/xen-acpi-memhotplug.c
index 2c3759ac10f0..678680cb213c 100644
--- a/trunk/drivers/xen/xen-acpi-memhotplug.c
+++ b/trunk/drivers/xen/xen-acpi-memhotplug.c
@@ -65,24 +65,6 @@ static int xen_hotadd_memory(int pxm, struct acpi_memory_info *info)
 	return rc;
 }
 
-static int xen_acpi_get_pxm(acpi_handle h)
-{
-	unsigned long long pxm;
-	acpi_status status;
-	acpi_handle handle;
-	acpi_handle phandle = h;
-
-	do {
-		handle = phandle;
-		status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm);
-		if (ACPI_SUCCESS(status))
-			return pxm;
-		status = acpi_get_parent(handle, &phandle);
-	} while (ACPI_SUCCESS(status));
-
-	return -ENXIO;
-}
-
 static int xen_acpi_memory_enable_device(struct acpi_memory_device *mem_device)
 {
 	int pxm, result;
diff --git a/trunk/include/xen/acpi.h b/trunk/include/xen/acpi.h
index 2b3103b33725..dc69c91605b8 100644
--- a/trunk/include/xen/acpi.h
+++ b/trunk/include/xen/acpi.h
@@ -69,4 +69,22 @@ static inline void xen_acpi_sleep_register(void)
 }
 #endif
 
+static inline int xen_acpi_get_pxm(acpi_handle h)
+{
+	unsigned long long pxm;
+	acpi_status status;
+	acpi_handle handle;
+	acpi_handle phandle = h;
+
+	do {
+		handle = phandle;
+		status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm);
+		if (ACPI_SUCCESS(status))
+			return pxm;
+		status = acpi_get_parent(handle, &phandle);
+	} while (ACPI_SUCCESS(status));
+
+	return -ENXIO;
+}
+
 #endif	/* _XEN_ACPI_H */