42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
# Commit 63dcef9fe5b880007075b5eb53f9950a826519ce
|
||
|
|
# Date 2015-04-14 15:02:10 +0200
|
||
|
|
# Author David Vrabel <david.vrabel@citrix.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
x86/hvm: don't include asm/spinlock.h
|
||
|
|
|
||
|
|
asm/spinlock.h should not be included directly.
|
||
|
|
|
||
|
|
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
||
|
|
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||
|
|
|
||
|
|
--- sle12sp1.orig/xen/arch/x86/hvm/hvm.c 2015-07-08 14:13:16.000000000 +0200
|
||
|
|
+++ sle12sp1/xen/arch/x86/hvm/hvm.c 2015-07-08 14:13:38.000000000 +0200
|
||
|
|
@@ -52,7 +52,6 @@
|
||
|
|
#include <asm/xstate.h>
|
||
|
|
#include <asm/traps.h>
|
||
|
|
#include <asm/mc146818rtc.h>
|
||
|
|
-#include <asm/spinlock.h>
|
||
|
|
#include <asm/mce.h>
|
||
|
|
#include <asm/hvm/hvm.h>
|
||
|
|
#include <asm/hvm/vpt.h>
|
||
|
|
--- sle12sp1.orig/xen/arch/x86/hvm/svm/svm.c 2015-01-14 18:44:18.000000000 +0100
|
||
|
|
+++ sle12sp1/xen/arch/x86/hvm/svm/svm.c 2015-07-08 14:13:38.000000000 +0200
|
||
|
|
@@ -41,7 +41,6 @@
|
||
|
|
#include <asm/msr.h>
|
||
|
|
#include <asm/i387.h>
|
||
|
|
#include <asm/iocap.h>
|
||
|
|
-#include <asm/spinlock.h>
|
||
|
|
#include <asm/hvm/emulate.h>
|
||
|
|
#include <asm/hvm/hvm.h>
|
||
|
|
#include <asm/hvm/support.h>
|
||
|
|
--- sle12sp1.orig/xen/arch/x86/hvm/vmx/vmx.c 2015-05-19 23:16:48.000000000 +0200
|
||
|
|
+++ sle12sp1/xen/arch/x86/hvm/vmx/vmx.c 2015-07-08 14:13:38.000000000 +0200
|
||
|
|
@@ -35,7 +35,6 @@
|
||
|
|
#include <asm/types.h>
|
||
|
|
#include <asm/debugreg.h>
|
||
|
|
#include <asm/msr.h>
|
||
|
|
-#include <asm/spinlock.h>
|
||
|
|
#include <asm/paging.h>
|
||
|
|
#include <asm/p2m.h>
|
||
|
|
#include <asm/mem_sharing.h>
|