diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-06-20 19:11:48 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-20 19:11:48 +0100 |
| commit | dd19802f2a224486c7f9a43bccd92e36c25afed9 (patch) | |
| tree | fff94fd674f5d25604dc13447577f9a9f84a1835 /kernel/sysctl_binary.c | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
| parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) | |
| download | lwn-dd19802f2a224486c7f9a43bccd92e36c25afed9.tar.gz lwn-dd19802f2a224486c7f9a43bccd92e36c25afed9.zip | |
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.
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index ece4b177052b..939a158eab11 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -1119,7 +1119,7 @@ static ssize_t bin_uuid(struct file *file, /* Only supports reads */ if (oldval && oldlen) { char buf[UUID_STRING_LEN + 1]; - uuid_be uuid; + uuid_t uuid; result = kernel_read(file, 0, buf, sizeof(buf) - 1); if (result < 0) @@ -1128,7 +1128,7 @@ static ssize_t bin_uuid(struct file *file, buf[result] = '\0'; result = -EIO; - if (uuid_be_to_bin(buf, &uuid)) + if (uuid_parse(buf, &uuid)) goto out; if (oldlen > 16) |