lguest: fix ugly <NULL> in /proc/interrupts

[linux-2.6-omap-h63xx.git] / include / asm-s390 / sfp-machine.h

diff --git a/include/asm-s390/sfp-machine.h b/include/asm-s390/sfp-machine.h
index de69dfa46fbba0baee8e305a61639adb1614d167..4e16aede4b0622b24e9660aecd5405ff5bba55fb 100644 (file)
--- a/include/asm-s390/sfp-machine.h
+++ b/include/asm-s390/sfp-machine.h
@@ -27,9 +27,9 @@
    
 
 #define _FP_W_TYPE_SIZE                32
-#define _FP_W_TYPE             unsigned long
-#define _FP_WS_TYPE            signed long
-#define _FP_I_TYPE             long
+#define _FP_W_TYPE             unsigned int
+#define _FP_WS_TYPE            signed int
+#define _FP_I_TYPE             int
 
 #define _FP_MUL_MEAT_S(R,X,Y)                                  \
   _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)
@@ -76,21 +76,23 @@
        unsigned int __r2 = (x2) + (y2);                        \
        unsigned int __r1 = (x1);                               \
        unsigned int __r0 = (x0);                               \
-       __asm__ ("   alr %2,%3\n"                               \
-                "   brc 12,0f\n"                               \
-                "   lhi 0,1\n"                                 \
-                "   alr %1,0\n"                                \
-                "   brc 12,0f\n"                               \
-                "   alr %0,0\n"                                \
-                "0:"                                           \
-                : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)     \
-                : "d" (y0), "i" (1) : "cc", "0" );             \
-       __asm__ ("   alr %1,%2\n"                               \
-                "   brc 12,0f\n"                               \
-                "   ahi %0,1\n"                                \
-                "0:"                                           \
-                : "+&d" (__r2), "+&d" (__r1)                   \
-                : "d" (y1) : "cc" );                           \
+       asm volatile(                                           \
+               "       alr     %2,%3\n"                        \
+               "       brc     12,0f\n"                        \
+               "       lhi     0,1\n"                          \
+               "       alr     %1,0\n"                         \
+               "       brc     12,0f\n"                        \
+               "       alr     %0,0\n"                         \
+               "0:"                                            \
+               : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)      \
+               : "d" (y0), "i" (1) : "cc", "0" );              \
+       asm volatile(                                           \
+               "       alr     %1,%2\n"                        \
+               "       brc     12,0f\n"                        \
+               "       ahi     %0,1\n"                         \
+               "0:"                                            \
+               : "+&d" (__r2), "+&d" (__r1)                    \
+               : "d" (y1) : "cc");                             \
        (r2) = __r2;                                            \
        (r1) = __r1;                                            \
        (r0) = __r0;                                            \
@@ -100,21 +102,23 @@
        unsigned int __r2 = (x2) - (y2);                        \
        unsigned int __r1 = (x1);                               \
        unsigned int __r0 = (x0);                               \
-       __asm__ ("   slr %2,%3\n"                               \
-                "   brc 3,0f\n"                                \
-                "   lhi 0,1\n"                                 \
-                "   slr %1,0\n"                                \
-                "   brc 3,0f\n"                                \
-                "   slr %0,0\n"                                \
-                "0:"                                           \
-                : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)     \
-                : "d" (y0) : "cc", "0" );                      \
-       __asm__ ("   slr %1,%2\n"                               \
-                "   brc 3,0f\n"                                \
-                "   ahi %0,-1\n"                               \
-                "0:"                                           \
-                : "+&d" (__r2), "+&d" (__r1)                   \
-                : "d" (y1) : "cc" );                           \
+       asm volatile(                                           \
+               "       slr   %2,%3\n"                          \
+               "       brc     3,0f\n"                         \
+               "       lhi     0,1\n"                          \
+               "       slr     %1,0\n"                         \
+               "       brc     3,0f\n"                         \
+               "       slr     %0,0\n"                         \
+               "0:"                                            \
+               : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)      \
+               : "d" (y0) : "cc", "0");                        \
+       asm volatile(                                           \
+               "       slr     %1,%2\n"                        \
+               "       brc     3,0f\n"                         \
+               "       ahi     %0,-1\n"                        \
+               "0:"                                            \
+               : "+&d" (__r2), "+&d" (__r1)                    \
+               : "d" (y1) : "cc");                             \
        (r2) = __r2;                                            \
        (r1) = __r1;                                            \
        (r0) = __r0;                                            \