diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-28 10:34:35 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-29 08:06:32 +1000 |
| commit | 433c5c20c505fef92be84c6afab70f1c2ab5eda3 (patch) | |
| tree | a3c91f13736a29cd5f81628e378869526445c07f | |
| parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) | |
| download | blackbird-op-linux-433c5c20c505fef92be84c6afab70f1c2ab5eda3.tar.gz blackbird-op-linux-433c5c20c505fef92be84c6afab70f1c2ab5eda3.zip | |
powerpc/kvm: Fix SMP=n build error in book3s_xics.c
Commit 34cb7954c0aa "Convert ICS mutex lock to spin lock" added an
include of asm/spinlock.h, which does not work in the SMP=n case.
It should instead include linux/spinlock.h
Fixes: 34cb7954c0aa ("KVM: PPC: Book3S HV: Convert ICS mutex lock to spin lock")
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/kvm/book3s_xics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c index 8f3e6cc54d95..c6ca7db64673 100644 --- a/arch/powerpc/kvm/book3s_xics.c +++ b/arch/powerpc/kvm/book3s_xics.c @@ -12,6 +12,7 @@ #include <linux/err.h> #include <linux/gfp.h> #include <linux/anon_inodes.h> +#include <linux/spinlock.h> #include <asm/uaccess.h> #include <asm/kvm_book3s.h> @@ -20,7 +21,6 @@ #include <asm/xics.h> #include <asm/debug.h> #include <asm/time.h> -#include <asm/spinlock.h> #include <linux/debugfs.h> #include <linux/seq_file.h> |
