[S390] Inline assembly cleanup.

[linux-block.git] / arch / s390 / mm / init.c

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 6e6b6de77770672968d528f42f5d824bca031e1a..127044e1707cd075fc7717b3a38321e3b6688ba2 100644 (file)
--- 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)
@@ -108,16 +99,23 @@ void __init paging_init(void)
         unsigned long pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | _KERNSEG_TABLE;
         static const int ssm_mask = 0x04000000L;
        unsigned long ro_start_pfn, ro_end_pfn;
+       unsigned long zones_size[MAX_NR_ZONES];
 
        ro_start_pfn = PFN_DOWN((unsigned long)&__start_rodata);
        ro_end_pfn = PFN_UP((unsigned long)&__end_rodata);
 
+       memset(zones_size, 0, sizeof(zones_size));
+       zones_size[ZONE_DMA] = max_low_pfn;
+       free_area_init_node(0, &contig_page_data, zones_size,
+                           __pa(PAGE_OFFSET) >> PAGE_SHIFT,
+                           zholes_size);
+
        /* unmap whole virtual address space */
        
         pg_dir = swapper_pg_dir;
 
-       for (i=0;i<KERNEL_PGD_PTRS;i++) 
-               pmd_clear((pmd_t*)pg_dir++);
+       for (i = 0; i < PTRS_PER_PGD; i++)
+               pmd_clear((pmd_t *) pg_dir++);
                
        /*
         * map whole physical memory to virtual memory (identity mapping) 
@@ -131,10 +129,7 @@ void __init paging_init(void)
                  */
                pg_table = (pte_t *) alloc_bootmem_pages(PAGE_SIZE);
 
-                pg_dir->pgd0 =  (_PAGE_TABLE | __pa(pg_table));
-                pg_dir->pgd1 =  (_PAGE_TABLE | (__pa(pg_table)+1024));
-                pg_dir->pgd2 =  (_PAGE_TABLE | (__pa(pg_table)+2048));
-                pg_dir->pgd3 =  (_PAGE_TABLE | (__pa(pg_table)+3072));
+               pmd_populate_kernel(&init_mm, (pmd_t *) pg_dir, pg_table);
                 pg_dir++;
 
                 for (tmp = 0 ; tmp < PTRS_PER_PTE ; tmp++,pg_table++) {
@@ -143,8 +138,8 @@ void __init paging_init(void)
                        else
                                pte = pfn_pte(pfn, PAGE_KERNEL);
                         if (pfn >= max_low_pfn)
-                                pte_clear(&init_mm, 0, &pte);
-                        set_pte(pg_table, pte);
+                               pte_val(pte) = _PAGE_TYPE_EMPTY;
+                       set_pte(pg_table, pte);
                         pfn++;
                 }
         }
@@ -152,23 +147,12 @@ 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();
-
-       {
-               unsigned long zones_size[MAX_NR_ZONES];
-
-               memset(zones_size, 0, sizeof(zones_size));
-               zones_size[ZONE_DMA] = max_low_pfn;
-               free_area_init_node(0, &contig_page_data, zones_size,
-                                   __pa(PAGE_OFFSET) >> PAGE_SHIFT,
-                                   zholes_size);
-       }
         return;
 }
 
@@ -236,10 +220,8 @@ void __init paging_init(void)
                                        pte = pfn_pte(pfn, __pgprot(_PAGE_RO));
                                else
                                        pte = pfn_pte(pfn, PAGE_KERNEL);
-                                if (pfn >= max_low_pfn) {
-                                        pte_clear(&init_mm, 0, &pte); 
-                                        continue;
-                                }
+                               if (pfn >= max_low_pfn)
+                                       pte_val(pte) = _PAGE_TYPE_EMPTY;
                                 set_pte(pt_dir, pte);
                                 pfn++;
                         }
@@ -249,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();