Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / arch / s390 / include / asm / sysinfo.h

diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h
index 73f12d21af4dc4f5ce3856e95761b8521b5a2e5b..f7054a892d9e921eef2cbc896c420b9c562c3188 100644 (file)
--- a/arch/s390/include/asm/sysinfo.h
+++ b/arch/s390/include/asm/sysinfo.h
@@ -15,6 +15,7 @@
 #define __ASM_S390_SYSINFO_H
 
 #include <asm/bitsperlong.h>
+#include <linux/uuid.h>
 
 struct sysinfo_1_1_1 {
        unsigned char p:1;
@@ -116,10 +117,13 @@ struct sysinfo_3_2_2 {
                char name[8];
                unsigned int caf;
                char cpi[16];
-               char reserved_1[24];
-
+               char reserved_1[3];
+               char ext_name_encoding;
+               unsigned int reserved_2;
+               uuid_be uuid;
        } vm[8];
-       char reserved_544[3552];
+       char reserved_3[1504];
+       char ext_names[8][256];
 };
 
 extern int topology_max_mnest;