Merge branch 'uuid-types' of git://git.infradead.org/users/hch/uuid into aarch64/for-next/ras-apei

Pull in uuid-types branch from Christoph, since this conflicts heavily
with the ACPI/APEI RAS work from Tyler Baicer and was created as an
immutable branch to avoid conflicts with ACPI development.

3 files changed, 7 insertions, 5 deletions

diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
index 64cae1a5deff..e1f75a1914a1 100644
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
@@ -370,7 +370,7 @@ acpi_status __wrap_acpi_evaluate_object(acpi_handle handle, acpi_string path,
 }
 EXPORT_SYMBOL(__wrap_acpi_evaluate_object);
 
-union acpi_object * __wrap_acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid,
+union acpi_object * __wrap_acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid,
                 u64 rev, u64 func, union acpi_object *argv4)
 {
         union acpi_object *obj = ERR_PTR(-ENXIO);
@@ -379,11 +379,11 @@ union acpi_object * __wrap_acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid,
         rcu_read_lock();
         ops = list_first_or_null_rcu(&iomap_head, typeof(*ops), list);
         if (ops)
-                obj = ops->evaluate_dsm(handle, uuid, rev, func, argv4);
+                obj = ops->evaluate_dsm(handle, guid, rev, func, argv4);
         rcu_read_unlock();
 
         if (IS_ERR(obj))
-                return acpi_evaluate_dsm(handle, uuid, rev, func, argv4);
+                return acpi_evaluate_dsm(handle, guid, rev, func, argv4);
         return obj;
 }
 EXPORT_SYMBOL(__wrap_acpi_evaluate_dsm);
diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index c2187178fb13..28859da78edf 100644
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -1559,7 +1559,7 @@ static unsigned long nfit_ctl_handle;
 union acpi_object *result;
 
 static union acpi_object *nfit_test_evaluate_dsm(acpi_handle handle,
-                const u8 *uuid, u64 rev, u64 func, union acpi_object *argv4)
+                const guid_t *guid, u64 rev, u64 func, union acpi_object *argv4)
 {
         if (handle != &nfit_ctl_handle)
                 return ERR_PTR(-ENXIO);
diff --git a/tools/testing/nvdimm/test/nfit_test.h b/tools/testing/nvdimm/test/nfit_test.h
index f54c0032c6ff..d3d63dd5ed38 100644
--- a/tools/testing/nvdimm/test/nfit_test.h
+++ b/tools/testing/nvdimm/test/nfit_test.h
@@ -13,6 +13,7 @@
 #ifndef __NFIT_TEST_H__
 #define __NFIT_TEST_H__
 #include <linux/list.h>
+#include <linux/uuid.h>
 #include <linux/ioport.h>
 #include <linux/spinlock_types.h>
 
@@ -36,7 +37,8 @@ typedef void *acpi_handle;
 
 typedef struct nfit_test_resource *(*nfit_test_lookup_fn)(resource_size_t);
 typedef union acpi_object *(*nfit_test_evaluate_dsm_fn)(acpi_handle handle,
-                const u8 *uuid, u64 rev, u64 func, union acpi_object *argv4);
+                 const guid_t *guid, u64 rev, u64 func,
+                 union acpi_object *argv4);
 void __iomem *__wrap_ioremap_nocache(resource_size_t offset,
                 unsigned long size);
 void __wrap_iounmap(volatile void __iomem *addr);