Skip to contentSkip to conversation

locking/qrwlock: Rename QUEUE_RWLOCK to QUEUED_RWLOCKS

PATCH New Waiman Long 2 participants 2 messages May 11, 2015 – May 12, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 locking/qrwlock: Rename QUEUE_RWLOCK to QUEUED_RWLOCKS

To be consistent with the queued spinlocks which use CONFIG_QUEUED_SPINLOCKS config parameter, the one for the queued rwlocks is now renamed to CONFIG_QUEUED_RWLOCKS.

---
 arch/x86/Kconfig         |    2 +-
 kernel/Kconfig.locks     |    6 +++---
 kernel/locking/Makefile  |    2 +-
 kernel/locking/qrwlock.c |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/Kconfig +1 -1
index 4a9693d..8fec044 100644
@@ -128,7 +128,7 @@ config X86
 	select CLONE_BACKWARDS if X86_32
 	select ARCH_USE_BUILTIN_BSWAP
 	select ARCH_USE_QUEUED_SPINLOCKS
-	select ARCH_USE_QUEUE_RWLOCK
+	select ARCH_USE_QUEUED_RWLOCKS
 	select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
 	select OLD_SIGACTION if X86_32
 	select COMPAT_OLD_SIGACTION if IA32_EMULATION
kernel/Kconfig.locks +3 -3
index 65d755b..ebdb004 100644
@@ -242,9 +242,9 @@ config QUEUED_SPINLOCKS
 	def_bool y if ARCH_USE_QUEUED_SPINLOCKS
 	depends on SMP
 
-config ARCH_USE_QUEUE_RWLOCK
+config ARCH_USE_QUEUED_RWLOCKS
 	bool
 
-config QUEUE_RWLOCK
-	def_bool y if ARCH_USE_QUEUE_RWLOCK
+config QUEUED_RWLOCKS
+	def_bool y if ARCH_USE_QUEUED_RWLOCKS
 	depends on SMP
kernel/locking/Makefile +1 -1
index 132aff9..7dd5c99 100644
@@ -26,5 +26,5 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
 obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
 obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
 obj-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o
-obj-$(CONFIG_QUEUE_RWLOCK) += qrwlock.o
+obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
 obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
kernel/locking/qrwlock.c +1 -1
index f956ede..00c12bb 100644
@@ -1,5 +1,5 @@
 /*
- * Queue read/write lock
+ * Queued read/write locks
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
Signature · 1 line
1.7.1
#1 lore raw
locking/qrwlock: Rename QUEUE_RWLOCK to QUEUED_RWLOCKS
Commit-ID:  c7114b4e6c53111d415485875725b60213ffc675
Gitweb:     http://git.kernel.org/tip/c7114b4e6c53111d415485875725b60213ffc675
Author:     Waiman Long <[email protected]>
AuthorDate: Mon, 11 May 2015 13:57:11 -0400
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 12 May 2015 09:46:00 +0200

locking/qrwlock: Rename QUEUE_RWLOCK to QUEUED_RWLOCKS

To be consistent with the queued spinlocks which use CONFIG_QUEUED_SPINLOCKS config parameter, the one for the queued rwlocks is now renamed to CONFIG_QUEUED_RWLOCKS.

Cc Borislav Petkov <[email protected]>
Cc Douglas Hatch <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Scott J Norton <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 arch/x86/Kconfig         | 2 +-
 kernel/Kconfig.locks     | 6 +++---
 kernel/locking/Makefile  | 2 +-
 kernel/locking/qrwlock.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/Kconfig +1 -1
index f8dc6ab..4e986e8 100644
@@ -128,7 +128,7 @@ config X86
 	select CLONE_BACKWARDS if X86_32
 	select ARCH_USE_BUILTIN_BSWAP
 	select ARCH_USE_QUEUED_SPINLOCKS
-	select ARCH_USE_QUEUE_RWLOCK
+	select ARCH_USE_QUEUED_RWLOCKS
 	select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
 	select OLD_SIGACTION if X86_32
 	select COMPAT_OLD_SIGACTION if IA32_EMULATION
kernel/Kconfig.locks +3 -3
index 65d755b..ebdb004 100644
@@ -242,9 +242,9 @@ config QUEUED_SPINLOCKS
 	def_bool y if ARCH_USE_QUEUED_SPINLOCKS
 	depends on SMP
 
-config ARCH_USE_QUEUE_RWLOCK
+config ARCH_USE_QUEUED_RWLOCKS
 	bool
 
-config QUEUE_RWLOCK
-	def_bool y if ARCH_USE_QUEUE_RWLOCK
+config QUEUED_RWLOCKS
+	def_bool y if ARCH_USE_QUEUED_RWLOCKS
 	depends on SMP
kernel/locking/Makefile +1 -1
index 132aff9..7dd5c99 100644
@@ -26,5 +26,5 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
 obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
 obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
 obj-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o
-obj-$(CONFIG_QUEUE_RWLOCK) += qrwlock.o
+obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
 obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
kernel/locking/qrwlock.c +1 -1
index f956ede..00c12bb 100644
@@ -1,5 +1,5 @@
 /*
- * Queue read/write lock
+ * Queued read/write locks
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by