Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1233754 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent aac72277

include/linux/rwsem.h

+4 −4
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ struct rw_semaphore { 
#endif

};



extern asmregparm struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);

extern asmregparm struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);

extern asmregparm struct rw_semaphore *rwsem_wake(struct rw_semaphore *);

extern asmregparm struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *);

extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);



/* Include the arch specific part */

#include <asm/rwsem.h>

lib/rwsem.c

+4 −6
Original line number Diff line number Diff line
@@ -222,8 +222,7 @@ rwsem_down_failed_common(struct rw_semaphore *sem, 
/*

 * wait for the read lock to be granted

 */

asmregparm struct rw_semaphore __sched *

rwsem_down_read_failed(struct rw_semaphore *sem)

struct rw_semaphore __sched *rwsem_down_read_failed(struct rw_semaphore *sem)

{

	return rwsem_down_failed_common(sem, RWSEM_WAITING_FOR_READ,

					-RWSEM_ACTIVE_READ_BIAS);
@@ -232,8 +231,7 @@ rwsem_down_read_failed(struct rw_semaphore *sem) 
/*

 * wait for the write lock to be granted

 */

asmregparm struct rw_semaphore __sched *

rwsem_down_write_failed(struct rw_semaphore *sem)

struct rw_semaphore __sched *rwsem_down_write_failed(struct rw_semaphore *sem)

{

	return rwsem_down_failed_common(sem, RWSEM_WAITING_FOR_WRITE,

					-RWSEM_ACTIVE_WRITE_BIAS);
@@ -243,7 +241,7 @@ rwsem_down_write_failed(struct rw_semaphore *sem) 
 * handle waking up a waiter on the semaphore

 * - up_read/up_write has decremented the active part of count if we come here

 */

asmregparm struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem)

struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem)

{

	unsigned long flags;
@@ -263,7 +261,7 @@ asmregparm struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem) 
 * - caller incremented waiting part of count and discovered it still negative

 * - just wake up any readers at the front of the queue

 */

asmregparm struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem)

struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem)

{

	unsigned long flags;