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

Commit c48e0913 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1125b464

drivers/s390/char/sclp.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -433,7 +433,6 @@ sclp_sync_wait(void) 
		    get_clock() > timeout &&

		    get_clock() > timeout &&

		    del_timer(&sclp_request_timer))

		    del_timer(&sclp_request_timer))

			sclp_request_timer.function(sclp_request_timer.data);

			sclp_request_timer.function(sclp_request_timer.data);

		barrier();

		cpu_relax();

		cpu_relax();

	}

	}

	local_irq_disable();

	local_irq_disable();

include/asm-s390/processor.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -201,8 +201,7 @@ unsigned long get_wchan(struct task_struct *p); 
static inline void cpu_relax(void)

static inline void cpu_relax(void)

{

{

	if (MACHINE_HAS_DIAG44)

	if (MACHINE_HAS_DIAG44)

		asm volatile("diag 0,0,68" : : : "memory");

		asm volatile("diag 0,0,68");

	else

	barrier();

	barrier();

}

}