diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 14:13:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 14:13:44 +0200 |
| commit | 875aabf52e21f84cb6700a760dc734c260c54e7e (patch) | |
| tree | 6c5b012dc066ef584cd5ba31fab1b7381db08281 /arch | |
| parent | Linux 4.12-rc7 (diff) | |
| parent | thermal: int340x_thermal: fix compile after the UUID API switch (diff) | |
| download | linux-dev-875aabf52e21f84cb6700a760dc734c260c54e7e.tar.xz linux-dev-875aabf52e21f84cb6700a760dc734c260c54e7e.zip | |
Merge branch 'uuid-types'
Merge 'uuid-types' from git://git.infradead.org/users/hch/uuid.git
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/include/asm/sysinfo.h | 4 | ||||
| -rw-r--r-- | arch/s390/kernel/sysinfo.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h index e784bed6ed7f..2b498e58b914 100644 --- a/arch/s390/include/asm/sysinfo.h +++ b/arch/s390/include/asm/sysinfo.h @@ -109,7 +109,7 @@ struct sysinfo_2_2_2 { unsigned short cpus_shared; char reserved_4[3]; unsigned char vsne; - uuid_be uuid; + uuid_t uuid; char reserved_5[160]; char ext_name[256]; }; @@ -134,7 +134,7 @@ struct sysinfo_3_2_2 { char reserved_1[3]; unsigned char evmne; unsigned int reserved_2; - uuid_be uuid; + uuid_t uuid; } vm[8]; char reserved_3[1504]; char ext_names[8][256]; diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c index eefcb54872a5..fb869b103825 100644 --- a/arch/s390/kernel/sysinfo.c +++ b/arch/s390/kernel/sysinfo.c @@ -242,7 +242,7 @@ static void print_ext_name(struct seq_file *m, int lvl, static void print_uuid(struct seq_file *m, int i, struct sysinfo_3_2_2 *info) { - if (!memcmp(&info->vm[i].uuid, &NULL_UUID_BE, sizeof(uuid_be))) + if (uuid_is_null(&info->vm[i].uuid)) return; seq_printf(m, "VM%02d UUID: %pUb\n", i, &info->vm[i].uuid); } |