• Waiman Long's avatar
    locking/arch: Move qrwlock.h include after qspinlock.h · d8d0da4e
    Waiman Long authored
    include/asm-generic/qrwlock.h was trying to get arch_spin_is_locked via
    asm-generic/qspinlock.h.  However, this does not work because architectures
    might be using queued rwlocks but not queued spinlocks (csky), or because they
    might be defining their own queued_* macros before including asm/qspinlock.h.
    
    To fix this, ensure that asm/spinlock.h always includes qrwlock.h after
    defining arch_spin_is_locked (either directly for csky, or via
    asm/qspinlock.h for other architectures).  The only inclusion elsewhere
    is in kernel/locking/qrwlock.c.  That one is really unnecessary because
    the file is only compiled in SMP configurations (config QUEUED_RWLOCKS
    depends on SMP) and in that case linux/spinlock.h already includes
    asm/qrwlock.h if needed, via asm/spinlock.h.
    Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
    Signed-off-by: default avatarWaiman Long <longman@redhat.com>
    Fixes: 26128cb6 ("locking/rwlocks: Add contention detection for rwlocks")
    Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
    Reviewed-by: default avatarBen Gardon <bgardon@google.com>
    [Add arch/sparc and kernel/locking parts per discussion with Waiman. - Paolo]
    Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    d8d0da4e
spinlock_64.h 409 Bytes