[S390] Inline assembly cleanup.

Major cleanup of all s390 inline assemblies. They now have a common
coding style. Quite a few have been shortened, mainly by using register
asm variables. Use of the EX_TABLE macro helps  as well. The atomic ops,
bit ops and locking inlines new use the Q-constraint if a newer gcc
is used.  That results in slightly better code.

Thanks to Christian Borntraeger for proof reading the changes.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 15 insertions, 26 deletions

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index cfd9b8f7a523..127044e1707c 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -45,26 +45,17 @@ void diag10(unsigned long addr)
 {
         if (addr >= 0x7ff00000)
                 return;
+        asm volatile(
 #ifdef CONFIG_64BIT
-        asm volatile (
-                "   sam31\n"
-                "   diag %0,%0,0x10\n"
-                "0: sam64\n"
-                ".section __ex_table,\"a\"\n"
-                "   .align 8\n"
-                "   .quad 0b, 0b\n"
-                ".previous\n"
-                : : "a" (addr));
+                "       sam31\n"
+                "       diag    %0,%0,0x10\n"
+                "0:     sam64\n"
 #else
-        asm volatile (
-                "   diag %0,%0,0x10\n"
+                "       diag    %0,%0,0x10\n"
                 "0:\n"
-                ".section __ex_table,\"a\"\n"
-                "   .align 4\n"
-                "   .long 0b, 0b\n"
-                ".previous\n"
-                : : "a" (addr));
 #endif
+                EX_TABLE(0b,0b)
+                : : "a" (addr));
 }
 
 void show_mem(void)
@@ -156,11 +147,10 @@ void __init paging_init(void)
         S390_lowcore.kernel_asce = pgdir_k;
 
         /* enable virtual mapping in kernel mode */
-        __asm__ __volatile__("    LCTL  1,1,%0\n"
-                             "    LCTL  7,7,%0\n"
-                             "    LCTL  13,13,%0\n"
-                             "    SSM   %1" 
-                             : : "m" (pgdir_k), "m" (ssm_mask));
+        __ctl_load(pgdir_k, 1, 1);
+        __ctl_load(pgdir_k, 7, 7);
+        __ctl_load(pgdir_k, 13, 13);
+        __raw_local_irq_ssm(ssm_mask);
 
         local_flush_tlb();
         return;
@@ -241,11 +231,10 @@ void __init paging_init(void)
         S390_lowcore.kernel_asce = pgdir_k;
 
         /* enable virtual mapping in kernel mode */
-        __asm__ __volatile__("lctlg 1,1,%0\n\t"
-                             "lctlg 7,7,%0\n\t"
-                             "lctlg 13,13,%0\n\t"
-                             "ssm   %1"
-                             : :"m" (pgdir_k), "m" (ssm_mask));
+        __ctl_load(pgdir_k, 1, 1);
+        __ctl_load(pgdir_k, 7, 7);
+        __ctl_load(pgdir_k, 13, 13);
+        __raw_local_irq_ssm(ssm_mask);
 
         local_flush_tlb();