48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
|
From 8194d18811df960052d42d93cdc5105b8ef089cc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fei Li <fli@suse.com>
|
||
|
|
Date: Fri, 7 Sep 2018 14:15:05 +0800
|
||
|
|
Subject: [PATCH] linux-headers: update
|
||
|
|
|
||
|
|
Update to Linux upstream commit 2ad0d5269970
|
||
|
|
("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
|
||
|
|
|
||
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
(cherry picked from commit d36f7de82995a42b749c29c5b60ba31483995a42)
|
||
|
|
[FL: bsc#1107489 - actually only backport the linux-header's update
|
||
|
|
for the etoken cpu feature used on the s390x platform)
|
||
|
|
Signed-off-by: Fei Li <fli@suse.com>
|
||
|
|
---
|
||
|
|
linux-headers/asm-s390/kvm.h | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
|
||
|
|
index 11def14301..1ab9901911 100644
|
||
|
|
--- a/linux-headers/asm-s390/kvm.h
|
||
|
|
+++ b/linux-headers/asm-s390/kvm.h
|
||
|
|
@@ -4,7 +4,7 @@
|
||
|
|
/*
|
||
|
|
* KVM s390 specific structures and definitions
|
||
|
|
*
|
||
|
|
- * Copyright IBM Corp. 2008
|
||
|
|
+ * Copyright IBM Corp. 2008, 2018
|
||
|
|
*
|
||
|
|
* Author(s): Carsten Otte <cotte@de.ibm.com>
|
||
|
|
* Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
@@ -225,6 +225,7 @@ struct kvm_guest_debug_arch {
|
||
|
|
#define KVM_SYNC_FPRS (1UL << 8)
|
||
|
|
#define KVM_SYNC_GSCB (1UL << 9)
|
||
|
|
#define KVM_SYNC_BPBC (1UL << 10)
|
||
|
|
+#define KVM_SYNC_ETOKEN (1UL << 11)
|
||
|
|
/* length and alignment of the sdnx as a power of two */
|
||
|
|
#define SDNXC 8
|
||
|
|
#define SDNXL (1UL << SDNXC)
|
||
|
|
@@ -258,6 +259,8 @@ struct kvm_sync_regs {
|
||
|
|
struct {
|
||
|
|
__u64 reserved1[2];
|
||
|
|
__u64 gscb[4];
|
||
|
|
+ __u64 etoken;
|
||
|
|
+ __u64 etoken_extension;
|
||
|
|
};
|
||
|
|
};
|
||
|
|
};
|