[PATCH] s390 (1/8): base fixes.

[Martin Schwidefsky]

 - Add console_unblank in machine_{restart,halt,power_off} to get
   all messages on the screen.
 - Fix write_trylock for 64 bit.

diffstat:
 arch/s390/kernel/setup.c    |    3 +++
 include/asm-s390/spinlock.h |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff -urN linux-2.6/arch/s390/kernel/setup.c linux-2.6-s390/arch/s390/kernel/setup.c
--- linux-2.6/arch/s390/kernel/setup.c	Fri Oct 17 23:42:54 2003
+++ linux-2.6-s390/arch/s390/kernel/setup.c	Tue Oct 21 16:36:07 2003
@@ -287,6 +287,7 @@
 
 void machine_restart(char *command)
 {
+	console_unblank();
 	_machine_restart(command);
 }
 
@@ -294,6 +295,7 @@
 
 void machine_halt(void)
 {
+	console_unblank();
 	_machine_halt();
 }
 
@@ -301,6 +303,7 @@
 
 void machine_power_off(void)
 {
+	console_unblank();
 	_machine_power_off();
 }
 
diff -urN linux-2.6/include/asm-s390/spinlock.h linux-2.6-s390/include/asm-s390/spinlock.h
--- linux-2.6/include/asm-s390/spinlock.h	Fri Oct 17 23:43:47 2003
+++ linux-2.6-s390/include/asm-s390/spinlock.h	Tue Oct 21 16:36:07 2003
@@ -217,7 +217,7 @@
 
 extern inline int _raw_write_trylock(rwlock_t *rw)
 {
-	unsigned int result, reg;
+	unsigned long result, reg;
 	
 	__asm__ __volatile__(
 #ifndef __s390x__
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/