Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-09-16 13:12:17 +0200
committerTakashi Iwai <tiwai@suse.de>2016-09-16 13:12:17 +0200
commit2bdb5b82545c66acb9d8bfaac176411ee035b1a4 (patch)
treec7595302c2ee8ea8a0fb2bb92daa9658e8e3ae9e
parent6b24dd64a0184c92e099bfaa16ca8baf37d9f8cc (diff)
parentacb62c89b7d8da2d6eb5cf436ae19f57c9fb95ca (diff)
Merge branch 'users/agraf/SLE12-SP2/for-next' into SLE12-SP2
Pull arm64 kabi fix from Alexander Graf.
-rw-r--r--patches.kabi/kabi-Keep-kvm-kabi-stable-across-kvm-arm-vtimer-enab.patch22
1 files changed, 19 insertions, 3 deletions
diff --git a/patches.kabi/kabi-Keep-kvm-kabi-stable-across-kvm-arm-vtimer-enab.patch b/patches.kabi/kabi-Keep-kvm-kabi-stable-across-kvm-arm-vtimer-enab.patch
index 48d2f02a9a..d3eceebdf6 100644
--- a/patches.kabi/kabi-Keep-kvm-kabi-stable-across-kvm-arm-vtimer-enab.patch
+++ b/patches.kabi/kabi-Keep-kvm-kabi-stable-across-kvm-arm-vtimer-enab.patch
@@ -1,4 +1,4 @@
-From 34532e08b631d3de1fb7189e209f465a75495fa2 Mon Sep 17 00:00:00 2001
+From 23541b1c9820dd9d07cfd552ba757989265b7668 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 16 Sep 2016 10:55:24 +0200
Subject: [PATCH] kabi: Keep kvm kabi stable across kvm arm vtimer enablement
@@ -13,9 +13,25 @@ This patch ensures that the kabi checker thinks it's safe too.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
- include/uapi/linux/kvm.h | 2 ++
- 1 file changed, 2 insertions(+)
+ arch/arm64/include/asm/kvm_host.h | 2 ++
+ include/uapi/linux/kvm.h | 2 ++
+ 2 files changed, 4 insertions(+)
+diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
+index 831bc33..cb73362 100644
+--- a/arch/arm64/include/asm/kvm_host.h
++++ b/arch/arm64/include/asm/kvm_host.h
+@@ -171,8 +171,10 @@ struct kvm_vcpu_arch {
+ /* Detect first run of a vcpu */
+ bool has_run_once;
+
++#ifndef __GENKSYMS__
+ /* User space wants timer notifications */
+ bool user_space_arm_timers;
++#endif
+ };
+
+ #define vcpu_gp_regs(v) (&(v)->arch.ctxt.gp_regs)
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index c601a4f..7fd3427 100644
--- a/include/uapi/linux/kvm.h