vserver 1.9.5.x5

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

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 177a3d2..7240782 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -45,11 +45,24 @@ void diag10(unsigned long addr)
         if (addr >= 0x7ff00000)
                 return;
 #ifdef __s390x__
-        asm volatile ("sam31\n\t"
-                      "diag %0,%0,0x10\n\t"
-                      "sam64" : : "a" (addr) );
+        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));
 #else
-        asm volatile ("diag %0,%0,0x10" : : "a" (addr) );
+        asm volatile (
+               "   diag %0,%0,0x10\n"
+               "0:\n"
+               ".section __ex_table,\"a\"\n"
+               "   .align 4\n"
+               "   .long 0b, 0b\n"
+               ".previous\n"
+               : : "a" (addr));
 #endif
 }
 
@@ -60,7 +73,7 @@ void show_mem(void)
 
         printk("Mem-info:\n");
         show_free_areas();
-        printk("Free swap:       %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
+        printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
         i = max_mapnr;
         while (i-- > 0) {
                 total++;