On Mon, 2017-06-05 at 23:22 +0200, Christoph Hellwig wrote:
> On Mon, Jun 05, 2017 at 08:10:42PM +0300, Andy Shevchenko wrote:
> >
> > I hope Christoph can replace old version of this series with new
> > one in
> > his uuid branch. URL in cover letter, repeating for your
> > convenience:
> >
> > [1]: git://git.infradead.org/users/hch/uuid.git
>
> Yeah, but I had to drop it again after noticing the guid_equals bits,
> and after not fixing up the GUID -> GUID_INIT rename.
>
> for-next in the above repo should have the proper base now, and acpi
> has the ACPI bits for Dan to test.
With one compile fix below the 'acpi' branch works for me. Please feel
free to add:
Tested-by: Dan Williams <dan.j.williams@xxxxxxxxx>
...to the changes that touch drivers/acpi/nfit/, drivers/nvdimm/, and
tools/testing/nvdimm, but I'm ok if you omit it if the branch is about
to go immutable. Speaking of which, let me know when it does go
immutable because the new libnvdimm enabling for ACPI 6.2 and EFI 2.7
needs some new guid handling code.
Please apply the following or fold it into commit c793ed7ccf42 "ACPI:
Switch to use generic guid_t in acpi_evaluate_dsm()"
----->8-----
>From 18b82755ea839bdc94127aebf0e2f788c19224f3 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@xxxxxxxxx>
Date: Tue, 6 Jun 2017 22:41:40 -0700
Subject: [PATCH] tools/testing/nvdimm: guid_t compile fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix up the declaration of the nfit_test_evaluate_dsm_fn type, to avoid
compile errors of the form:
tools/testing/nvdimm/test/iomap.c: In function ‘__wrap_acpi_evaluate_dsm’:
tools/testing/nvdimm/test/iomap.c:382:35: error: passing argument 2 of
‘ops->evaluate_dsm’ from incompatible pointer type
obj = ops->evaluate_dsm(handle, guid, rev, func, argv4);
^~~~
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
---
tools/testing/nvdimm/test/nfit_test.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/testing/nvdimm/test/nfit_test.h b/tools/testing/nvdimm/test/nfit_test.h
index f54c0032c6ff..c4e80104165a 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,7 @@ 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);
--
2.9.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
