Merge branch 'linus' into x86/gart

[linux-2.6-omap-h63xx.git] / arch / x86 / math-emu / errors.c

diff --git a/arch/x86/math-emu/errors.c b/arch/x86/math-emu/errors.c
index 7cb5bf3495b2c6044545655881740c8f8383014c..59d353d2c599ec26d21a9ab65ea2641e121b25a5 100644 (file)
--- a/arch/x86/math-emu/errors.c
+++ b/arch/x86/math-emu/errors.c
@@ -149,7 +149,7 @@ void FPU_printall(void)
                printk("SW: invalid operation\n");
 #endif /* DEBUGGING */
 
-       printk(" SW: b=%d st=%ld es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n", partial_status & 0x8000 ? 1 : 0,   /* busy */
+       printk(" SW: b=%d st=%d es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n", partial_status & 0x8000 ? 1 : 0,    /* busy */
               (partial_status & 0x3800) >> 11, /* stack top pointer */
               partial_status & 0x80 ? 1 : 0,   /* Error summary status */
               partial_status & 0x40 ? 1 : 0,   /* Stack flag */
@@ -162,7 +162,7 @@ void FPU_printall(void)
               partial_status & SW_Denorm_Op ? 1 : 0,
               partial_status & SW_Invalid ? 1 : 0);
 
-       printk(" CW: ic=%d rc=%ld%ld pc=%ld%ld iem=%d     ef=%d%d%d%d%d%d\n",
+       printk(" CW: ic=%d rc=%d%d pc=%d%d iem=%d     ef=%d%d%d%d%d%d\n",
               control_word & 0x1000 ? 1 : 0,
               (control_word & 0x800) >> 11, (control_word & 0x400) >> 10,
               (control_word & 0x200) >> 9, (control_word & 0x100) >> 8,
@@ -374,7 +374,7 @@ asmlinkage void FPU_exception(int n)
 
 /* Real operation attempted on a NaN. */
 /* Returns < 0 if the exception is unmasked */
-int real_1op_NaN(FPU_REG * a)
+int real_1op_NaN(FPU_REG *a)
 {
        int signalling, isNaN;
 
@@ -573,7 +573,7 @@ asmlinkage int denormal_operand(void)
        }
 }
 
-asmlinkage int arith_overflow(FPU_REG * dest)
+asmlinkage int arith_overflow(FPU_REG *dest)
 {
        int tag = TAG_Valid;
 
@@ -601,7 +601,7 @@ asmlinkage int arith_overflow(FPU_REG * dest)
 
 }
 
-asmlinkage int arith_underflow(FPU_REG * dest)
+asmlinkage int arith_underflow(FPU_REG *dest)
 {
        int tag = TAG_Valid;