[patch 1/2] dmar: coding style cleanup for dmar_parse_one_rhsa()

[patch 1/2] dmar: coding style cleanup for dmar_parse_one_rhsa()

[Suresh Siddha]

[-- Attachment #1: fix_indentation_config.patch --]
[-- Type: text/plain, Size: 574 bytes --]

Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
---
 drivers/pci/dmar.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: iommu-2.6/drivers/pci/dmar.c
===================================================================
--- iommu-2.6.orig/drivers/pci/dmar.c
+++ iommu-2.6/drivers/pci/dmar.c
@@ -362,8 +362,9 @@ dmar_parse_one_rhsa(struct acpi_dmar_hea
 			if (!node_online(node))
 				node = -1;
 			drhd->iommu->node = node;
-		return 0;
-	}
+
+			return 0;
+		}
 
 	return -ENODEV;
 }

[patch 2/2] acpi: define acpi_map_pxm_to_node() for !CONFIG_NUMA

[Suresh Siddha]

[-- Attachment #1: fix_acpi_map_pxm_to_node_for_nonnuma.patch --]
[-- Type: text/plain, Size: 870 bytes --]

Alexander Beregalov reported:
	drivers/pci/dmar.c: In function 'dmar_parse_one_rhsa':
	drivers/pci/dmar.c:360: error: implicit declaration of function
	'acpi_map_pxm_to_node'

Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
---
 include/acpi/acpi_numa.h |    7 +++++++
 1 file changed, 7 insertions(+)

Index: iommu-2.6/include/acpi/acpi_numa.h
===================================================================
--- iommu-2.6.orig/include/acpi/acpi_numa.h
+++ iommu-2.6/include/acpi/acpi_numa.h
@@ -16,5 +16,12 @@ extern int node_to_pxm(int);
 extern void __acpi_map_pxm_to_node(int, int);
 extern int acpi_map_pxm_to_node(int);
 
+#else				/* !CONFIG_ACPI_NUMA */
+
+static inline int acpi_map_pxm_to_node(int pxm)
+{
+	return -1;
+}
+
 #endif				/* CONFIG_ACPI_NUMA */
 #endif				/* __ACP_NUMA_H */