aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorCollin Walling <walling@linux.ibm.com>2020-06-22 11:46:35 -0400
committerChristian Borntraeger <borntraeger@de.ibm.com>2020-06-23 09:16:48 +0200
commita23816f3cdcbffe5dc6e8c331914b3f51b87c2f3 (patch)
tree9e48ecbb7cf7588e7f57eb876b774ed592a15c75 /arch/s390/include
parentLinux 5.8-rc1 (diff)
downloadlinux-dev-a23816f3cdcbffe5dc6e8c331914b3f51b87c2f3.tar.xz
linux-dev-a23816f3cdcbffe5dc6e8c331914b3f51b87c2f3.zip
s390/setup: diag 318: refactor struct
The diag 318 struct introduced in include/asm/diag.h can be reused in KVM, so let's condense the version code fields in the diag318_info struct for easier usage and simplify it until we can determine how the data should be formatted. Signed-off-by: Collin Walling <walling@linux.ibm.com> Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Janosch Frank <frankja@linux.ibm.com> Link: https://lore.kernel.org/r/20200622154636.5499-2-walling@linux.ibm.com Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/diag.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h
index 0036eab14391..ca8f85b53a90 100644
--- a/arch/s390/include/asm/diag.h
+++ b/arch/s390/include/asm/diag.h
@@ -298,10 +298,8 @@ struct diag26c_mac_resp {
union diag318_info {
unsigned long val;
struct {
- unsigned int cpnc : 8;
- unsigned int cpvc_linux : 24;
- unsigned char cpvc_distro[3];
- unsigned char zero;
+ unsigned long cpnc : 8;
+ unsigned long cpvc : 56;
};
};