| Message ID | 1430181767-2193-1-git-send-email-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 433c5c20c505fef92be84c6afab70f1c2ab5eda3 |
| Delegated to: | Michael Ellerman |
| Headers | show |
On Tue, Apr 28, 2015 at 10:42:47AM +1000, Michael Ellerman wrote: > 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") > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: Paul Mackerras <paulus@samba.org>
On 28.04.15 02:42, Michael Ellerman wrote: > 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") > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Reviewed-by: Alexander Graf <agraf@suse.de> Alex
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>
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") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- I'll drop this in my fixes branch for tomorrow unless someone objects. arch/powerpc/kvm/book3s_xics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)