lkml.org 
[lkml]   [2011]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subjectrwsem: 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>
    ---
    include/linux/rwsem.h | 8 ++++----
    lib/rwsem.c | 10 ++++------
    2 files changed, 8 insertions(+), 10 deletions(-)

    Index: linux-2.6/include/linux/rwsem.h
    ===================================================================
    --- linux-2.6.orig/include/linux/rwsem.h
    +++ linux-2.6/include/linux/rwsem.h
    @@ -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>
    Index: linux-2.6/lib/rwsem.c
    ===================================================================
    --- linux-2.6.orig/lib/rwsem.c
    +++ linux-2.6/lib/rwsem.c
    @@ -222,8 +222,7 @@ rwsem_down_failed_common(struct rw_semap
    /*
    * 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_semapho
    /*
    * 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_semaph
    * 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_wa
    * - 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;


    \
     
     \ /
      Last update: 2011-01-26 21:35    [W:0.024 / U:189.600 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site