diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
| commit | fdd050b5b3c96813ae6756ed68157d32ba31b9f2 (patch) | |
| tree | ca1a216730e32471cd17886d9de1902228bc340c /arch/s390 | |
| parent | f06345add95f388519e83ec398134853e0f64ac9 (diff) | |
| parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) | |
| download | linux-fdd050b5b3c96813ae6756ed68157d32ba31b9f2.tar.bz2 | |
Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
Diffstat (limited to 'arch/s390')
| -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); } |