Merge tag 'uuid-for-4.13' of git://git.infradead.org/users/hch/uuid
Pull uuid subsystem from Christoph Hellwig:
"This is the new uuid subsystem, in which Amir, Andy and I have started
consolidating our uuid/guid helpers and improving the types used for
them. Note that various other subsystems have pulled in this tree, so
I'd like it to go in early.
UUID/GUID summary:
- introduce the new uuid_t/guid_t types that are going to replace the
somewhat confusing uuid_be/uuid_le types and make the terminology
fit the various specs, as well as the userspace libuuid library.
(me, based on a previous version from Amir)
- consolidated generic uuid/guid helper functions lifted from XFS and
libnvdimm (Amir and me)
- conversions to the new types and helpers (Amir, Andy and me)"
* tag 'uuid-for-4.13' of git://git.infradead.org/users/hch/uuid: (34 commits)
ACPI: hns_dsaf_acpi_dsm_guid can be static
mmc: sdhci-pci: make guid intel_dsm_guid static
uuid: Take const on input of uuid_is_null() and guid_is_null()
thermal: int340x_thermal: fix compile after the UUID API switch
thermal: int340x_thermal: Switch to use new generic UUID API
acpi: always include uuid.h
ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()
ACPI / extlog: Switch to use new generic UUID API
ACPI / bus: Switch to use new generic UUID API
ACPI / APEI: Switch to use new generic UUID API
acpi, nfit: Switch to use new generic UUID API
MAINTAINERS: add uuid entry
tmpfs: generate random sb->s_uuid
scsi_debug: switch to uuid_t
nvme: switch to uuid_t
sysctl: switch to use uuid_t
partitions/ldm: switch to use uuid_t
overlayfs: use uuid_t instead of uuid_be
fs: switch ->s_uuid to uuid_t
ima/policy: switch to use uuid_t
...
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user