]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
locking/arch, powerpc/rtas: Use arch_spin_lock() instead of arch_spin_lock_flags()
authorWill Deacon <will.deacon@arm.com>
Wed, 18 Oct 2017 11:51:09 +0000 (12:51 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 18 Oct 2017 13:15:07 +0000 (15:15 +0200)
arch_spin_lock_flags() is an internal part of the spinlock implementation
and is no longer available when SMP=n and DEBUG_SPINLOCK=y, so the PPC
RTAS code fails to compile in this configuration:

   arch/powerpc/kernel/rtas.c: In function 'lock_rtas':
>> arch/powerpc/kernel/rtas.c:81:2: error: implicit declaration of function 'arch_spin_lock_flags' [-Werror=implicit-function-declaration]
     arch_spin_lock_flags(&rtas.lock, flags);
     ^~~~~~~~~~~~~~~~~~~~

Since there's no good reason to use arch_spin_lock_flags() here (the code
in question already calls local_irq_save(flags)), switch it over to
arch_spin_lock and get things building again.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1508327469-20231-1-git-send-email-will.deacon@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/powerpc/kernel/rtas.c

index 1643e9e5365573659bbdf79d6e5dfddb5ee4eafc..3f1c4fcbe0aa50616c45ce4369bbdb0ecdd15ad4 100644 (file)
@@ -78,7 +78,7 @@ static unsigned long lock_rtas(void)
 
        local_irq_save(flags);
        preempt_disable();
-       arch_spin_lock_flags(&rtas.lock, flags);
+       arch_spin_lock(&rtas.lock);
        return flags;
 }