Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rwsem: Remove redundant asmregparm annotation

Browse Source 
commit d123375425 upstream.

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>
[PG: fixes compile errors when using newer gcc on 2.6.34 baseline]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
This commit is contained in:
Thomas Gleixner 2011-01-26 21:32:01 +01:00 committed by Paul Gortmaker
parent aea328d332
commit 0b6a58d3ea
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/include/asm/rwsem.h
View File

@ -45,14 +45,10 @@
struct rwsem_waiter; struct rwsem_waiter;
extern asmregparm struct rw_semaphore * extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);
rwsem_down_read_failed(struct rw_semaphore *sem); extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);
extern asmregparm struct rw_semaphore * extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *);
rwsem_down_write_failed(struct rw_semaphore *sem); extern struct rw_semaphore *rwsem_downgrade_wake(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);
/* /*
* the semaphore definition * the semaphore definition

10
lib/rwsem.c
View File

@ -188,8 +188,7 @@ rwsem_down_failed_common(struct rw_semaphore *sem,
/* /*
* wait for the read lock to be granted * wait for the read lock to be granted
*/ */
asmregparm struct rw_semaphore __sched * struct rw_semaphore __sched *rwsem_down_read_failed(struct rw_semaphore *sem)
rwsem_down_read_failed(struct rw_semaphore *sem)
{ {
struct rwsem_waiter waiter; struct rwsem_waiter waiter;
@ -202,8 +201,7 @@ rwsem_down_read_failed(struct rw_semaphore *sem)
/* /*
* wait for the write lock to be granted * wait for the write lock to be granted
*/ */
asmregparm struct rw_semaphore __sched * struct rw_semaphore __sched *rwsem_down_write_failed(struct rw_semaphore *sem)
rwsem_down_write_failed(struct rw_semaphore *sem)
{ {
struct rwsem_waiter waiter; struct rwsem_waiter waiter;
@ -217,7 +215,7 @@ rwsem_down_write_failed(struct rw_semaphore *sem)
* handle waking up a waiter on the semaphore * handle waking up a waiter on the semaphore
* - up_read/up_write has decremented the active part of count if we come here * - 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; unsigned long flags;
@ -237,7 +235,7 @@ asmregparm struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem)
* - caller incremented waiting part of count and discovered it still negative * - caller incremented waiting part of count and discovered it still negative
* - just wake up any readers at the front of the queue * - 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; unsigned long flags;