Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[platform/kernel/linux-rpi.git] / kernel / locking / qspinlock_paravirt.h

diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h
index 5a0cf5f..8f36c27 100644 (file)
--- a/kernel/locking/qspinlock_paravirt.h
+++ b/kernel/locking/qspinlock_paravirt.h
@@ -4,7 +4,7 @@
 #endif
 
 #include <linux/hash.h>
 #endif
 
 #include <linux/hash.h>

-#include <linux/bootmem.h>
+#include <linux/memblock.h>

 #include <linux/debug_locks.h>
 
 /*
 #include <linux/debug_locks.h>
 
 /*


@@ -49,8 +49,6 @@ enum vcpu_state {
 
 struct pv_node {
        struct mcs_spinlock     mcs;
 
 struct pv_node {
        struct mcs_spinlock     mcs;

-       struct mcs_spinlock     __res[3];
-

        int                     cpu;
        u8                      state;
 };
        int                     cpu;
        u8                      state;
 };


@@ -281,7 +279,7 @@ static void pv_init_node(struct mcs_spinlock *node)
 {
        struct pv_node *pn = (struct pv_node *)node;
 
 {
        struct pv_node *pn = (struct pv_node *)node;
 

-       BUILD_BUG_ON(sizeof(struct pv_node) > 5*sizeof(struct mcs_spinlock));
+       BUILD_BUG_ON(sizeof(struct pv_node) > sizeof(struct qnode));

 
        pn->cpu = smp_processor_id();
        pn->state = vcpu_running;
 
        pn->cpu = smp_processor_id();
        pn->state = vcpu_running;