diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-06-26 10:54:27 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-26 10:54:27 +0100 |
| commit | 3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb (patch) | |
| tree | 81e5823a1c84a0131dc110f711f3c1416b4df985 /kernel/sysctl_binary.c | |
| parent | 9ad95c46c18ba828dfcf467024a45eb5b43ce769 (diff) | |
| parent | 77b246b32b2c4bc21e352dcb8b53a8aba81ee5a4 (diff) | |
Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core
Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
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) |