Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c48e09131bd7c632c80a3245688d2d29dbc4f6b5
Commit:     c48e09131bd7c632c80a3245688d2d29dbc4f6b5
Parent:     1125b4640fea29aafe9bf24672e2da9672f6592e
Author:     Heiko Carstens <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 5 21:17:20 2007 +0100
Committer:  Martin Schwidefsky <[EMAIL PROTECTED]>
CommitDate: Mon Feb 5 21:17:20 2007 +0100

    [S390] Small barrier() and cpu_relax() cleanup.
    
    cpu_relax() has barrier() semantics hence there is no need to use both
    of them in conjunction in sclp_sync_wait(). Also change cpu_relax()
    so it's more obvious that it has barrier semantics.
    
    Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]>
    Signed-off-by: Martin Schwidefsky <[EMAIL PROTECTED]>
---
 drivers/s390/char/sclp.c     |    1 -
 include/asm-s390/processor.h |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 027cdc1..c1dd19b 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -433,7 +433,6 @@ sclp_sync_wait(void)
                    get_clock() > timeout &&
                    del_timer(&sclp_request_timer))
                        sclp_request_timer.function(sclp_request_timer.data);
-               barrier();
                cpu_relax();
        }
        local_irq_disable();
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
index cbbedc6..5dc6b93 100644
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
@@ -201,9 +201,8 @@ unsigned long get_wchan(struct task_struct *p);
 static inline void cpu_relax(void)
 {
        if (MACHINE_HAS_DIAG44)
-               asm volatile("diag 0,0,68" : : : "memory");
-       else
-               barrier();
+               asm volatile("diag 0,0,68");
+       barrier();
 }
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to