Skip to contentSkip to conversation

powerpc/rtas: Use arch_spin_lock instead of arch_spin_lock_flags

PATCH New Will Deacon 2 participants 2 messages Oct 18, 2017 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/rtas: Use arch_spin_lock instead of arch_spin_lock_flags

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':

Quoted 1 line
Quoted 1 line

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.

---

This patch fixes build breakage in -next via the -tip tree.

 arch/powerpc/kernel/rtas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/rtas.c +1 -1
index 1643e9e53655..3f1c4fcbe0aa 100644
@@ -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;
 }
 
Signature · 1 line
2.1.4
#1 lore raw

[tip:locking/core] locking/arch, powerpc/rtas: Use arch_spin_lock() instead of arch_spin_lock_flags()

locking/arch, powerpc/rtas: Use arch_spin_lock() instead of arch_spin_lock_flags()
Commit-ID:  58788a9b6060890e481c8111fac43d065560ebcb
Gitweb:     https://git.kernel.org/tip/58788a9b6060890e481c8111fac43d065560ebcb
Author:     Will Deacon <[email protected]>
AuthorDate: Wed, 18 Oct 2017 12:51:09 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 18 Oct 2017 15:15:07 +0200

locking/arch, powerpc/rtas: Use arch_spin_lock() instead of arch_spin_lock_flags()

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':

Quoted 1 line
Quoted 1 line

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.

---
 arch/powerpc/kernel/rtas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/rtas.c +1 -1
index 1643e9e..3f1c4fc 100644
@@ -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;
 }