Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rwsem: Remove redundant asmregparm annotation

Peter Zijlstra pointed out, that the only user of asmregparm (x86) is
compiling the kernel already with -mregparm=3. So the annotation of
the rwsem functions is redundant. Remove it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: David Miller <davem@davemloft.net>
Cc: Chris Zankel <chris@zankel.net>
LKML-Reference: <alpine.LFD.2.00.1101262130450.31804@localhost6.localdomain6>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

+8 -10
+4 -4
include/linux/rwsem.h
··· 32 32 #endif 33 33 }; 34 34 35 - extern asmregparm struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem); 36 - extern asmregparm struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem); 37 - extern asmregparm struct rw_semaphore *rwsem_wake(struct rw_semaphore *); 38 - extern asmregparm struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem); 35 + extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem); 36 + extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem); 37 + extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *); 38 + extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem); 39 39 40 40 /* Include the arch specific part */ 41 41 #include <asm/rwsem.h>
+4 -6
lib/rwsem.c
··· 222 222 /* 223 223 * wait for the read lock to be granted 224 224 */ 225 - asmregparm struct rw_semaphore __sched * 226 - rwsem_down_read_failed(struct rw_semaphore *sem) 225 + struct rw_semaphore __sched *rwsem_down_read_failed(struct rw_semaphore *sem) 227 226 { 228 227 return rwsem_down_failed_common(sem, RWSEM_WAITING_FOR_READ, 229 228 -RWSEM_ACTIVE_READ_BIAS); ··· 231 232 /* 232 233 * wait for the write lock to be granted 233 234 */ 234 - asmregparm struct rw_semaphore __sched * 235 - rwsem_down_write_failed(struct rw_semaphore *sem) 235 + struct rw_semaphore __sched *rwsem_down_write_failed(struct rw_semaphore *sem) 236 236 { 237 237 return rwsem_down_failed_common(sem, RWSEM_WAITING_FOR_WRITE, 238 238 -RWSEM_ACTIVE_WRITE_BIAS); ··· 241 243 * handle waking up a waiter on the semaphore 242 244 * - up_read/up_write has decremented the active part of count if we come here 243 245 */ 244 - asmregparm struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem) 246 + struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem) 245 247 { 246 248 unsigned long flags; 247 249 ··· 261 263 * - caller incremented waiting part of count and discovered it still negative 262 264 * - just wake up any readers at the front of the queue 263 265 */ 264 - asmregparm struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem) 266 + struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem) 265 267 { 266 268 unsigned long flags; 267 269